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

Conflicts:
	templates/themes/sitemap/info.php

templates/themes/sitemap/info.php

@@ -23,7 +23,7 @@
 		'name' => 'url',
 		'type' => 'text',
 		'comment' => '(with trailing slash)',
-		'default' => 'http://' . (isset ($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : "localhost") . $config['root'],
+		'default' => (isset($_SERVER['HTTP_HOST']) ? 'http://' . $_SERVER['HTTP_HOST'] . $config['root'] : ''),
 		'size' => '20'
 	);