Merge pull request #453 from phpList/release-3.3.7

Release 3.3.7

Author: xh3n1

README.md

@@ -1,7 +1,7 @@
 # phpList 3
 
 [![Build Status](https://travis-ci.org/phpList/phplist3.svg?branch=master)](https://travis-ci.org/phpList/phplist3)
-[![Stable release](https://img.shields.io/badge/stable-3.3.6-blue.svg)](https://sourceforge.net/projects/phplist/files/phplist/)
+[![Stable release](https://img.shields.io/badge/stable-3.3.7-blue.svg)](https://sourceforge.net/projects/phplist/files/phplist/)
 [![License](https://poser.pugx.org/phplist/phplist4-core/license.svg)](https://www.gnu.org/licenses/agpl-3.0.en.html)
 
 Fully functional Open Source email marketing manager for creating, sending, integrating, and analysing email campaigns and newsletters: https://www.phplist.org

VERSION

@@ -1,6 +1,6 @@
 # file that keeps track of the latest tag in cvs and the corresponding version
 # this automates publishing a new version, when it's tagged
 # if you don't understand this, don't worry. You don't need this file
-VERSION=3.3.6
-DEVVERSION=3.3.7
+VERSION=3.3.7
+DEVVERSION=3.3.8
 

public_html/lists/admin/pluginlib.php

@@ -86,11 +86,6 @@
                     $plugin_initialised = getConfig(md5('plugin-'.$className.'-initialised'));
 
                     if (!empty($plugin_initialised)) {
-                        if (!pluginCanEnable($className)) {
-                            // an already enabled plugin now does not meet its dependencies, do not enable it
-                            $pluginInstance->enabled = false;
-                            continue;
-                        }                            
                         $GLOBALS['plugins'][$className] = $pluginInstance;
                         $pluginInstance->enabled = true;
                     } elseif (in_array($className, $auto_enable_plugins)) {
@@ -144,7 +139,13 @@ function($a, $b) {
     }
 );
 
-foreach ($plugins as $pluginInstance) {
+foreach ($plugins as $className => $pluginInstance) {
+    if (!pluginCanEnable($className)) {
+        // an already enabled plugin now does not meet its dependencies, do not enable it
+        $pluginInstance->enabled = false;
+        unset($plugins[$className]);
+        continue;
+    }                            
     $pluginInstance->activate();
 }