[Phpgroupware-cvs] setup index.php

[Dave Hall]

CVSROOT:        /cvsroot/phpgroupware
Module name:    setup
Changes by:     Dave Hall <skwashd>     06/07/19 04:16:33

Modified files:
        .              : index.php 

Log message:
        make setup work again

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/setup/index.php?cvsroot=phpgroupware&r1=1.121&r2=1.122

Patches:
Index: index.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/index.php,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -b -r1.121 -r1.122
--- index.php   22 Mar 2006 09:46:50 -0000      1.121
+++ index.php   19 Jul 2006 04:16:32 -0000      1.122
@@ -5,7 +5,7 @@
        * @copyright Portions Copyright (C) 2000-2005 Free Software Foundation, 
Inc. http://www.fsf.org/
        * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
        * @package setup
-       * @version $Id: index.php,v 1.121 2006/03/22 09:46:50 sigurdne Exp $
+       * @version $Id: index.php,v 1.122 2006/07/19 04:16:32 skwashd Exp $
        */
 
        /*
@@ -250,7 +250,8 @@
                                        break;
                                case 'new':
                                        // process all apps and langs(last 
param True), excluding apps with the no_mass_update flag set.
-                               //      $setup_info = 
$GLOBALS['phpgw_setup']->detection->upgrade_exclude($setup_info);
+                                       //$setup_info = 
$GLOBALS['phpgw_setup']->detection->upgrade_exclude($setup_info);
+
                                        // Only process phpgwapi, admin and 
preferences.
                                        $setup_info = 
$GLOBALS['phpgw_setup']->detection->base_install($setup_info);
                                        $setup_info = 
$GLOBALS['phpgw_setup']->process->pass($setup_info,'new',$GLOBALS['DEBUG'],True);
@@ -259,7 +260,7 @@
                                        
$GLOBALS['phpgw_info']['setup']['currentver']['phpgwapi'] = 'oldversion';
                                        break;
                                case 'oldversion':
-                                       $setup_info = 
$GLOBALS['phpgw_setup']->process->pass($setup_info,'upgrade',$GLOBALS['DEBUG']);
+                                       $setup_info = 
$GLOBALS['phpgw_setup']->process->pass($GLOBALS['setup_info'],'upgrade',$_REQUEST['DEBUG']);
                                        
$GLOBALS['phpgw_info']['setup']['currentver']['phpgwapi'] = 'oldversion';
                                        break;
                        }