0
/
leftypol_lainchan
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge pull request #69 from PietroCarrara/json-flags 

Enable flags on the JSON api
This commit is contained in:
towards-a-new-leftypol 2020-12-31 05:40:15 -05:00 committed by GitHub
parent 69f6fb90c6 59c2e35d70
commit d8dfe76e03
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
inc/api.php
View File

@ -111,10 +111,10 @@ class Api {
if ($threadsPage) return $apiPost; if ($threadsPage) return $apiPost;
// Handle country field // 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); $modifiers = extract_modifiers($post->body_nomarkup);
if (isset($modifiers['flag']) && isset($modifiers['flag alt']) && preg_match('/^[a-z]{2}$/', $modifiers['flag'])) { if (isset($modifiers['flag']) && isset($modifiers['flag alt']) && preg_match('/^[1-9a-z_-]{2,}$/', $modifiers['flag'])) {
$country = strtoupper($modifiers['flag']); $country = strtolower($modifiers['flag']);
if ($country) { if ($country) {
$apiPost['country'] = $country; $apiPost['country'] = $country;
$apiPost['country_name'] = $modifiers['flag alt']; $apiPost['country_name'] = $modifiers['flag alt'];

0
inc/instance-config.php Normal file → Executable file
View File