Changeset 29779 for trunk/admin/include/plugins.class.php

Timestamp:

Sep 25, 2014, 11:25:24 AM (10 years ago)

Author:

mistic100

Message:

final fix for plugins update ?

• plugins.version is not updated in "activate" action
• plugins.version is updated in "update" action and "load_plugin()" function (not only for plugins using maintain.class.php)

cases covered:

• autoupdate while active or inactive
• FTP update while active or inactive

File:

• trunk/admin/include/plugins.class.php (modified) (2 diffs)

trunk/admin/include/plugins.class.php

@@ -153 +153 @@
       case 'update':
         $previous_version = $this->fs_plugins[$plugin_id]['version'];
-        $upgrade_status = $this->extract_plugin_files('upgrade', $options['revision'], $plugin_id);
-
-        if ($upgrade_status === 'ok')
+        $errors[0] = $this->extract_plugin_files('upgrade', $options['revision'], $plugin_id);
+
+        if ($errors[0] === 'ok')
         {
           $this->get_fs_plugin($plugin_id); // refresh plugins list
+          $new_version = $this->fs_plugins[$plugin_id]['version'];
 
           $plugin_maintain = self::build_maintain_class($plugin_id);
-          $plugin_maintain->update($previous_version, $this->fs_plugins[$plugin_id]['version']);
-        }
-
-        return $upgrade_status;
+          $plugin_maintain->update($previous_version, $new_version, $errors);
+
+          if ($new_version != 'auto')
+          {
+            $query = '
+UPDATE '. PLUGINS_TABLE .'
+  SET version=\''. $new_version .'\'
+  WHERE id=\''. $plugin_id .'\'
+;';
+            pwg_query($query);
+          }
+        }
+
         break;
 
@@ -187 +197 @@
           $query = '
 UPDATE '. PLUGINS_TABLE .'
-  SET state=\'active\',
-    version=\''. $this->fs_plugins[$plugin_id]['version'] .'\'
+  SET state=\'active\'
   WHERE id=\''. $plugin_id .'\'
 ;';