admin/quick-n-dirty
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/savetheinternet/Tinyboard

Browse Source 
Conflicts:
	inc/config.php
	inc/display.php
	inc/functions.php
This commit is contained in:
czaks
2013-08-16 10:07:24 -04:00
parent c2ffd32436 0565e2119d
commit 146243c473
245 changed files with 112 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
post.php
View File

@@ -424,7 +424,16 @@ if (isset($_POST['delete'])) {
$post['body'] = escape_markup_modifiers($post['body']);
if ($mod && isset($post['raw']) && $post['raw']) {
$post['body'] = '<tinyboard raw html>' . $post['body'] . '</tinyboard>';
$post['body'] .= '<tinyboard raw html>1</tinyboard>';
}
if ($config['country_flags']) {
if (!geoip_db_avail(GEOIP_COUNTRY_EDITION)) {
error('GeoIP not available: ' . geoip_db_filename(GEOIP_COUNTRY_EDITION));
}
if ($country_code = @geoip_country_code_by_name($_SERVER['REMOTE_ADDR'])) {
$post['body'] .= '<tinyboard flag>' . strtolower($country_code) . '</tinyboard>';
}
}
if (mysql_version() >= 50503) {