Dev: Fix merge conflict with plugin white list

LimeSurvey · Oct 2, 2018 · 38c0f02 · 38c0f02
1 parent ba30a82
commit 38c0f02
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/application/libraries/PluginManager/PluginManager.php b/application/libraries/PluginManager/PluginManager.php
@@ -288,7 +288,7 @@ public function scanPlugins($includeInstalledPlugins = false)
                         $plugin = Plugin::model()->find('name = :name', [':name' => $pluginName]);
                         if (empty($plugin)
                             || ($includeInstalledPlugins && $plugin->load_error == 0)) {
-                            if (file_exists($file)) {
+                            if (file_exists($file) && $this->_checkWhitelist($pluginName)) {
                                 try {
                                     $result[$pluginName] = $this->getPluginInfo($pluginName, $pluginDir);
                                 } catch (\Throwable $ex) {
@@ -572,9 +572,13 @@ public function readConfigFiles()
         $this->loadPlugins();
     }
 
-
-    private function _checkWhitelist($pluginName){
-        if(App()->getConfig('usePluginWhitelist')) {
+    /**
+     * @param string $pluginName
+     * @return boolean
+     */
+    private function _checkWhitelist($pluginName)
+    {
+        if (App()->getConfig('usePluginWhitelist')) {
 
             $whiteList = App()->getConfig('pluginWhitelist');
             $coreList = App()->getConfig('pluginCoreList');