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

[Dave Hall]

CVSROOT:        /cvsroot/phpgwapi
Module name:    phpgwapi
Changes by:     Dave Hall <skwashd>     06/09/17 04:45:44

Modified files:
        inc            : class.setup_detection.inc.php 

Log message:
        fix notice and remove some old code

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.setup_detection.inc.php?cvsroot=phpgwapi&r1=1.13&r2=1.14

Patches:
Index: class.setup_detection.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.setup_detection.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- class.setup_detection.inc.php       3 Sep 2006 06:15:27 -0000       1.13
+++ class.setup_detection.inc.php       17 Sep 2006 04:45:44 -0000      1.14
@@ -7,7 +7,7 @@
        * @license http://www.fsf.org/licenses/gpl.html GNU General Public 
License
        * @package phpgwapi
        * @subpackage application
-       * @version $Id: class.setup_detection.inc.php,v 1.13 2006/09/03 
06:15:27 skwashd Exp $
+       * @version $Id: class.setup_detection.inc.php,v 1.14 2006/09/17 
04:45:44 skwashd Exp $
        */
 
        /**
@@ -368,19 +368,17 @@
                        }
                        if (!$check)
                        {
-                               $GLOBALS['setup_info'] = 
$GLOBALS['phpgw_setup']->detection->get_db_versions($GLOBALS['setup_info']);
-                       }
-                       
if($GLOBALS['phpgw_setup']->alessthanb($GLOBALS['setup_info']['phpgwapi']['currentver'],
 '0.9.14.501') ||
-                          
ereg('0\.9\.15\.00[01]{1,1}',$GLOBALS['setup_info']['phpgwapi']['currentver']))
+                               if ( !isset($GLOBALS['setup_info']) || 
!is_array($GLOBALS['setup_info']) )
                        {
-                               $langtbl  = 'lang';
-                               $languagestbl = 'languages';
+                                       $GLOBALS['setup_info'] = array();
                        }
-                       else
-                       {
+
+                               $GLOBALS['setup_info'] = 
$this->get_db_versions($GLOBALS['setup_info']);
+                       }
+
                                $langtbl  = 'phpgw_lang';
                                $languagestbl = 'phpgw_languages';
-                       }
+
                        $GLOBALS['phpgw_setup']->db->query($q = "SELECT 
COUNT(*) as langcount FROM $langtbl",__LINE__,__FILE__);
                        $GLOBALS['phpgw_setup']->db->next_record();
                        if($GLOBALS['phpgw_setup']->db->f('langcount') == 0)