From 6a56894e940db0b1f7ee6788fbc38f26c80d004d Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sat, 9 Jun 2018 15:58:18 +0200 Subject: New extension event + Tumblr GDPR (#1924) * New extension event + Tumblr GDPR https://github.com/FreshRSS/FreshRSS/issues/1894 simplepie_before_init event * Refactor extension enabling + Tumblr GDPR enabled by default Add possibility for extensions to be enabled by default, and disabled back by users. * Minor whitespace --- app/Controllers/extensionController.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'app/Controllers/extensionController.php') diff --git a/app/Controllers/extensionController.php b/app/Controllers/extensionController.php index 311fd2e96..806e5a696 100644 --- a/app/Controllers/extensionController.php +++ b/app/Controllers/extensionController.php @@ -140,7 +140,7 @@ class FreshRSS_extension_Controller extends Minz_ActionController { if ($res === true) { $ext_list = $conf->extensions_enabled; - array_push_unique($ext_list, $ext_name); + $ext_list[$ext_name] = true; $conf->extensions_enabled = $ext_list; $conf->save(); @@ -196,7 +196,11 @@ class FreshRSS_extension_Controller extends Minz_ActionController { if ($res === true) { $ext_list = $conf->extensions_enabled; - array_remove($ext_list, $ext_name); + $legacyKey = array_search($ext_name, $ext_list, true); + if ($legacyKey !== false) { //Legacy format FreshRSS < 1.11.1 + unset($ext_list[$legacyKey]); + } + $ext_list[$ext_name] = false; $conf->extensions_enabled = $ext_list; $conf->save(); -- cgit v1.2.3