From 59c2e35d7041bcef02bc47f30a81069e1bdfd40d Mon Sep 17 00:00:00 2001 From: Pietro Carrara Date: Thu, 31 Dec 2020 07:29:10 -0300 Subject: [PATCH] Enable API flags for user_flag and country_flags --- inc/api.php | 2 +- inc/instance-config.php | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/inc/api.php b/inc/api.php index 09c4ba5b..0ebaaf22 100644 --- a/inc/api.php +++ b/inc/api.php @@ -111,7 +111,7 @@ class Api { if ($threadsPage) return $apiPost; // Handle country field - if (isset($post->body_nomarkup) && $this->config['country_flags']) { + if (isset($post->body_nomarkup) && ($this->config['country_flags'] || $this->config['user_flag'])) { $modifiers = extract_modifiers($post->body_nomarkup); if (isset($modifiers['flag']) && isset($modifiers['flag alt']) && preg_match('/^[1-9a-z_-]{2,}$/', $modifiers['flag'])) { $country = strtolower($modifiers['flag']); diff --git a/inc/instance-config.php b/inc/instance-config.php index f47466d1..14aa4e1b 100755 --- a/inc/instance-config.php +++ b/inc/instance-config.php @@ -127,7 +127,6 @@ $config['allowed_ext_files'][] = 'epub'; */ $config['country_flags_condensed'] = false; $config['user_flag'] = true; -$config['country_flags'] = true; $config['flag_style'] = 'width:auto;height:11px;'; $config['user_flags'] = array ( '4th_international' => '4th International',