friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #6086 from friendica/fabrixxm-patch-1 

Fix Friendica node info json
This commit is contained in:
Hypolite Petovan 2018-11-06 10:48:00 -05:00 committed by GitHub
parent 7389dc0b20 0441a169a9
commit dd35cd0701
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mod/friendica.php
View File

@ -52,7 +52,7 @@ function friendica_init(App $a)
'locked_features' => $locked_features,
'explicit_content' => (int)Config::get('system', 'explicit_content', false),
'language' => Config::get('system','language'),
'register_policy ' => $register_policy[intval(Config::get('config', 'register_policy'))],
'register_policy' => $register_policy[intval(Config::get('config', 'register_policy'))],
'admin' => $admin,
'site_name' => Config::get('config', 'sitename'),
'platform' => FRIENDICA_PLATFORM,

7
src/Protocol/PortableContact.php
View File

@ -1375,7 +1375,12 @@ class PortableContact
}
$info = $data['info'];
$register_policy = constant($data['register_policy']);
if (in_array($data['register_policy'], ['REGISTER_CLOSED', 'REGISTER_APPROVE', 'REGISTER_OPEN'])) {
$register_policy = constant($data['register_policy']);
} else {
Logger::log("Register policy '{$data['register_policy']}' from $server_url is invalid.");
$register_policy = REGISTER_CLOSED; // set a default value
}
$platform = $data['platform'];
}
}