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

Conflicts:
	inc/display.php

1 files changed, 3 insertions, 2 deletions

diff --git a/post.php b/post.php
index ce45ea52..d2749632 100644
--- a/post.php
+++ b/post.php
@@ -424,7 +424,7 @@ if (isset($_POST['delete'])) {
 	$post['body'] = escape_markup_modifiers($post['body']);
 	
 	if ($mod && isset($post['raw']) && $post['raw']) {
-		$post['body'] .= '<tinyboard raw html>1</tinyboard>';
+		$post['body'] .= "\n<tinyboard raw html>1</tinyboard>";
 	}
 	
 	if ($config['country_flags']) {
@@ -432,7 +432,8 @@ if (isset($_POST['delete'])) {
 			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>';
+			$post['body'] .= "\n<tinyboard flag>" . strtolower($country_code) . "</tinyboard>" .
+				"\n<tinyboard flag alt>" . @geoip_country_name_by_name($_SERVER['REMOTE_ADDR']) . "</tinyboard>";
 		}
 	}