[geeklog-cvs] geeklog: Handle plugin upgrade when adding new plugins

[geeklog-cvs at lists.geeklog.net]

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/2a81ead43d9c
changeset: 6596:2a81ead43d9c
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Dec 27 10:47:14 2008 +0100
description:
Handle plugin upgrade when adding new plugins

diffstat:

1 file changed, 13 insertions(+), 8 deletions(-)
public_html/admin/install/index.php |   21 +++++++++++++--------

diffs (40 lines):

diff -r a0f2b65c1957 -r 2a81ead43d9c public_html/admin/install/index.php
--- a/public_html/admin/install/index.php	Fri Dec 26 19:31:15 2008 +0100
+++ b/public_html/admin/install/index.php	Sat Dec 27 10:47:14 2008 +0100
@@ -554,14 +554,13 @@
                     // disable plugins for which we don't have the source files
                     INST_checkPlugins();
 
-                    if (! $install_plugins) {
-                        // extra step 4: upgrade plugins
-                        $next_link = 'index.php?step=4&mode=' . $install_type
-                                   . '&language=' . $language;
+                    // extra step 4: upgrade plugins
+                    $next_link = 'index.php?step=4&mode=' . $install_type
+                               . '&language=' . $language;
+                    if ($install_plugins) {
+                        $next_link .= '&install_plugins=true';
                     }
 
-                    // Installation is complete. Continue onto either plugin
-                    // installation or success page
                     header('Location: ' . $next_link);
 
                 } else {
@@ -578,8 +577,14 @@
     case 4:
         INST_pluginUpgrades();
 
-        $next_link = 'success.php?type=' . $install_type
-                   . '&language=' . $language;
+        $install_plugins = ((isset($_GET['install_plugins']) &&
+                                !empty($_GET['install_plugins'])) 
+                         ? true 
+                         : false);
+        $next_link = ($install_plugins
+                   ? 'install-plugins.php?language=' . $language
+                   : 'success.php?type=' . $install_type
+                                         . '&language=' . $language);
 
         header('Location: ' . $next_link);