friendica
/
friendica
mirror of https://git.friendi.ca/friendica/friendica.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Normalize how we store enabled addons/themes in config value to straight comma-separated list

pull/7044/head
Hypolite Petovan 2019-04-26 09:11:01 -04:00
parent 26bee52212
commit fb503e82bf
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Core/Addon.php
View File

@ -2,6 +2,7 @@
/** /**
* @file src/Core/Addon.php * @file src/Core/Addon.php
*/ */
namespace Friendica\Core; namespace Friendica\Core;
use Friendica\BaseObject; use Friendica\BaseObject;
@ -313,7 +314,7 @@ class Addon extends BaseObject
*/ */
public static function saveEnabledList() public static function saveEnabledList()
{ {
return Config::set('system', 'addon', implode(', ', self::$addons)); return Config::set('system', 'addon', implode(',', self::$addons));
} }
/** /**

2
src/Core/Theme.php
View File

@ -20,7 +20,7 @@ class Theme
public static function getAllowedList() public static function getAllowedList()
{ {
$allowed_themes_str = Config::get('system', 'allowed_themes'); $allowed_themes_str = Config::get('system', 'allowed_themes');
$allowed_themes_raw = explode(',', $allowed_themes_str); $allowed_themes_raw = explode(',', str_replace(' ', '', $allowed_themes_str));
$allowed_themes = []; $allowed_themes = [];
if (count($allowed_themes_raw)) { if (count($allowed_themes_raw)) {
foreach ($allowed_themes_raw as $theme) { foreach ($allowed_themes_raw as $theme) {