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

[Dave Hall]

CVSROOT:        /cvsroot/phpgwapi
Module name:    phpgwapi
Changes by:     Dave Hall <skwashd>     06/08/29 04:16:59

Modified files:
        inc            : class.sql_builder.inc.php 

Log message:
        fix undefined indicies

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.sql_builder.inc.php?cvsroot=phpgwapi&r1=1.3&r2=1.4

Patches:
Index: class.sql_builder.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.sql_builder.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- class.sql_builder.inc.php   6 Aug 2006 04:51:25 -0000       1.3
+++ class.sql_builder.inc.php   29 Aug 2006 04:16:59 -0000      1.4
@@ -8,7 +8,7 @@
        * @license http://www.fsf.org/licenses/gpl.html GNU General Public 
License
        * @package phpgwapi
        * @subpackage database
-       * @version $Id: class.sql_builder.inc.php,v 1.3 2006/08/06 04:51:25 
skwashd Exp $
+       * @version $Id: class.sql_builder.inc.php,v 1.4 2006/08/29 04:16:59 
skwashd Exp $
        * @internal Development of this application was funded by 
http://www.sogrp.com
        * @link http://www.sogrp.com/
        */
@@ -61,7 +61,8 @@
                        $ent = $this->ent_name($field);
                        $this->ldebug('get_entity', array('Field' => $field,
                                      'Entity Name' => $ent));
-                       if(!is_object($this->entities[$ent]) && !empty($ent))
+                       if( (!isset($this->entities[$ent]) || 
!is_object($this->entities[$ent]) ) 
+                               && !empty($ent))
                        {
                                $this->ldebug('get_entity', "Try to instantiate 
$ent because $field", 'msg');
                                $this->instance_entity($ent);
@@ -137,7 +138,8 @@
 
                function instance_entity($entity_name)
                {
-                       if(is_object($this->entities[$entity_name]))
+                       if( isset($this->entities[$entity_name])
+                               && is_object($this->entities[$entity_name]))
                        {
                                $this->ldebug('instance_entity',
                                              "Already an object $entity_name", 
'msg');