diff options
| author | czaks <marcin@6irc.net> | 2014-09-20 22:14:04 +0200 |
|---|---|---|
| committer | czaks <marcin@6irc.net> | 2014-09-20 22:14:04 +0200 |
| commit | 7e8bf0ec497f4dc437369b6c5f8061c347733d84 (patch) | |
| tree | 47665ca9c7b2e9dd08d20e56cd7d827699d22ddd /post.php | |
| parent | f5820d2aae45f60b6e6998b9ec2997c68a66fbf6 (diff) | |
| parent | 7288f1dec786844a159af30f0286be5912b13db6 (diff) | |
Merge branch 'master' of github.com:vichan-devel/Tinyboard
Diffstat (limited to 'post.php')
| -rw-r--r-- | post.php | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -487,7 +487,7 @@ if (isset($_POST['delete'])) { $post['body'] .= "\n<tinyboard raw html>1</tinyboard>"; } - if ($config['country_flags']) { + if (($config['country_flags'] && !$config['allow_no_country']) || ($config['country_flags'] && $config['allow_no_country'] && !isset($_POST['no_country']))) { require 'inc/lib/geoip/geoip.inc'; $gi=geoip\geoip_open('inc/lib/geoip/GeoIPv6.dat', GEOIP_STANDARD); |
