merge -c2815 from trunk to branch 2.0

- bugs correction in upgrade_1.7.0.php.
- only non-standard plugins are deactivated during upgrade.


git-svn-id: http://piwigo.org/svn/branches/2.0@2816 68402e56-0260-453c-a942-63ccdbb3a9ee

1 files changed, 1 insertions, 13 deletions

diff --git a/upgrade.php b/upgrade.php
index 2dd99747b..cb1d7337e 100644
--- a/upgrade.php
+++ b/upgrade.php
@@ -237,19 +237,7 @@ else
     // Plugins deactivation
     if (in_array(PREFIX_TABLE.'plugins', $tables))
     {
-      $query = '
-UPDATE '.PREFIX_TABLE.'plugins SET state="inactive" WHERE state="active"
-;';
-      mysql_query($query);
-
-      if (mysql_affected_rows() > 0)
-      {
-        array_push(
-          $page['infos'],
-          'As a precaution, all activated plugins have been deactivated.
-You must check for plugins upgrade before reactiving them.'
-        );
-      }
+      deactivate_non_standard_plugins();
     }
 
     // Create empty local files to avoid log errors