[Phpgroupware-cvs] property/inc class.solocation.inc.php class.uil...

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    property
Branch:         
Changes by:     Sigurd Nes <address@hidden>     06/03/02 15:48:41

Modified files:
        inc            : class.solocation.inc.php 
                         class.uilocation.inc.php 

Log message:
        

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/class.solocation.inc.php.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/class.uilocation.inc.php.diff?tr1=1.19&tr2=1.20&r1=text&r2=text

Patches:
Index: property/inc/class.solocation.inc.php
diff -u property/inc/class.solocation.inc.php:1.22 
property/inc/class.solocation.inc.php:1.23
--- property/inc/class.solocation.inc.php:1.22  Wed Mar  1 12:27:15 2006
+++ property/inc/class.solocation.inc.php       Thu Mar  2 15:48:41 2006
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage location
-       * @version $Id: class.solocation.inc.php,v 1.22 2006/03/01 12:27:15 
sigurdne Exp $
+       * @version $Id: class.solocation.inc.php,v 1.23 2006/03/02 15:48:41 
sigurdne Exp $
        */
 
        /**
@@ -143,7 +143,7 @@
                        while ($this->db->next_record())
                        {
                                $categories[$i]['id']                           
= $this->db->f('id');
-                               $categories[$i]['name']                         
= stripslashes($this->db->f('descr')) . ' [' . $this->db->f('id') . ']';
+                               $categories[$i]['name']                         
= stripslashes($this->db->f('descr'));
                                $i++;
                        }
                        return $categories;
@@ -521,6 +521,7 @@
                        $j=0;
                        $cols_return_count      = count($cols_return);
                        $location_count = $type_id-1;
+                       $contacts                       = 
CreateObject('phpgwapi.contacts');
 
                        while ($this->db->next_record())
                        {
Index: property/inc/class.uilocation.inc.php
diff -u property/inc/class.uilocation.inc.php:1.19 
property/inc/class.uilocation.inc.php:1.20
--- property/inc/class.uilocation.inc.php:1.19  Wed Mar  1 12:27:15 2006
+++ property/inc/class.uilocation.inc.php       Thu Mar  2 15:48:41 2006
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage location
-       * @version $Id: class.uilocation.inc.php,v 1.19 2006/03/01 12:27:15 
sigurdne Exp $
+       * @version $Id: class.uilocation.inc.php,v 1.20 2006/03/02 15:48:41 
sigurdne Exp $
        */
 
        /**
@@ -430,7 +430,7 @@
                                }
                                else
                                {
-                                       $function_msg                           
        = $uicols['descr'][($type_id-1)];
+                                       $function_msg                           
        = $uicols['descr'][($type_id)];
                                }
                        }