[Phpgroupware-cvs] phpgwapi/inc class.sql_entity.inc.php, 1.1.2.15 class.contacts_sql.inc.php, 1.17.2.2.2.74

[skwashd]

Update of phpgwapi/inc

Modified Files:
     Branch: Version-0_9_16-branch
            class.sql_entity.inc.php lines: +3 -3
            class.contacts_sql.inc.php lines: +2 -1

Log Message:
applying patch #4331 from jarg

====================================================
Index: phpgwapi/inc/class.sql_entity.inc.php
diff -u phpgwapi/inc/class.sql_entity.inc.php:1.1.2.14 
phpgwapi/inc/class.sql_entity.inc.php:1.1.2.15
--- phpgwapi/inc/class.sql_entity.inc.php:1.1.2.14      Sat Nov  6 15:34:26 2004
+++ phpgwapi/inc/class.sql_entity.inc.php       Wed Dec  7 12:04:35 2005
@@ -76,9 +76,9 @@
                // Just INSERT (update?)
                var $values;
                // Imported links
-               var $ilink;
+               var $ilink = array();
                // Exported links
-               var $elink;
+               var $elink = array();
                var $ondebug;
                var $table;


====================================================
Index: phpgwapi/inc/class.contacts_sql.inc.php
diff -u phpgwapi/inc/class.contacts_sql.inc.php:1.17.2.2.2.73 
phpgwapi/inc/class.contacts_sql.inc.php:1.17.2.2.2.74
--- phpgwapi/inc/class.contacts_sql.inc.php:1.17.2.2.2.73       Wed Dec  7 
09:15:06 2005
+++ phpgwapi/inc/class.contacts_sql.inc.php     Wed Dec  7 12:04:35 2005
@@ -1313,6 +1313,7 @@
                */
                function get_addr_contact_data($contact_id, $criteria='')
                {
+                       $locations = array();
                        $data = array('addr_contact_id',
                                      'key_addr_id',
                                      'addr_type',