[Phpgroupware-cvs] phpgwapi/inc class.setup_process.inc.php

[Sigurd Nes]

CVSROOT:        /sources/phpgwapi
Module name:    phpgwapi
Changes by:     Sigurd Nes <sigurdne>   06/10/03 17:18:54

Modified files:
        inc            : class.setup_process.inc.php 

Log message:
        phpgwapi-upgrade

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.setup_process.inc.php?cvsroot=phpgwapi&r1=1.20&r2=1.21

Patches:
Index: class.setup_process.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/class.setup_process.inc.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- class.setup_process.inc.php 3 Oct 2006 02:55:50 -0000       1.20
+++ class.setup_process.inc.php 3 Oct 2006 17:18:54 -0000       1.21
@@ -6,7 +6,7 @@
        * @license http://www.fsf.org/licenses/gpl.html GNU General Public 
License
        * @package phpgwapi
        * @subpackage application
-       * @version $Id: class.setup_process.inc.php,v 1.20 2006/10/03 02:55:50 
skwashd Exp $
+       * @version $Id: class.setup_process.inc.php,v 1.21 2006/10/03 17:18:54 
sigurdne Exp $
        */
 
        /**
@@ -69,12 +69,17 @@
                        {
                                return False;
                        }
+                       $setup_info = 
$GLOBALS['phpgw_setup']->detection->get_versions($setup_info);
+                       /* Check current versions and dependencies */
+                       $setup_info = 
$GLOBALS['phpgw_setup']->detection->get_db_versions($setup_info);
+                       $setup_info = 
$GLOBALS['phpgw_setup']->detection->compare_versions($setup_info);
+                       $setup_info = 
$GLOBALS['phpgw_setup']->detection->check_depends($setup_info);
+                       
                        // Place api first
                        $pass = array();
                        $pass['phpgwapi']               = 
$setup_info['phpgwapi'];
                        $pass['admin']                  = $setup_info['admin'];
                        $pass['preferences']    = $setup_info['preferences'];
-                       $setup_info = 
$GLOBALS['phpgw_setup']->detection->get_versions($setup_info);
 
                        $passed = array();
                        $passing = array();
@@ -88,11 +93,6 @@
                                {
                                        echo '<br>process->pass(): #' . $i . ' 
for ' . $method . ' processing' . "\n"; 
                                }
-                               /* Check current versions and dependencies */
-                               $setup_info = 
$GLOBALS['phpgw_setup']->detection->get_db_versions($setup_info);
-                               $setup_info = 
$GLOBALS['phpgw_setup']->detection->compare_versions($setup_info);
-                               //_debug_array($setup_info);exit;
-                               $setup_info = 
$GLOBALS['phpgw_setup']->detection->check_depends($setup_info);
                                //if($i==2) { _debug_array($passed);exit; }
 
                                /* stuff the rest of the apps, but only those 
with available upgrades */