diff options
| author | czaks <marcin@6irc.net> | 2013-07-20 17:28:34 -0400 |
|---|---|---|
| committer | czaks <marcin@6irc.net> | 2013-07-20 17:28:34 -0400 |
| commit | 9f323ae65fb9370a93d1aaa869ab5edfbaca49cf (patch) | |
| tree | 926a464440df8a37509ae54165edefac4a89d874 /templates/themes | |
| parent | f04566f6d30553560d5a69e25e38de72a60f297c (diff) | |
| parent | e8b693b0447e5a61f740b27c5f3a57f68d544342 (diff) | |
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
templates/themes/sitemap/info.php
Diffstat (limited to 'templates/themes')
| -rw-r--r-- | templates/themes/sitemap/info.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/themes/sitemap/info.php b/templates/themes/sitemap/info.php index 1198c2e3..43b529fa 100644 --- a/templates/themes/sitemap/info.php +++ b/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' ); |