[Phpgroupware-cvs] property/class.soentity.php, 1.1.1.8

[nomail]

Update of /property
Modified Files:
        Branch: 
          class.soentity.php

date: 2004/04/30 17:35:56;  author: sigurdne;  state: Exp;  lines: +2 -2

Log Message:
no message
=====================================================================
Index: property/class.soentity.php
diff -u property/class.soentity.php:1.1.1.7 property/class.soentity.php:1.1.1.8
--- property/class.soentity.php:1.1.1.7 Fri Apr 30 09:52:25 2004
+++ property/class.soentity.php Fri Apr 30 17:35:56 2004
@@ -162,7 +162,7 @@
 
                        if ($cat_id > 0)
                        {
-                               
$user_columns=$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['entity_columns_'.$entity_id.'_'.$cat_id];
+                               
$user_columns=$GLOBALS['phpgw_data']['prefs'][$this->currentapp . 
'.entity_columns_'.$entity_id.'_'.$cat_id];
 //html_print_r($user_columns);
 
                                if (isset($user_columns) AND 
is_array($user_columns) AND $user_columns[0])
@@ -330,7 +330,7 @@
                                        {
 //html_print_r($value);
 
-                                               
$entity_list[$j][$cols_return_extra[$i]['name']]=date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],strtotime($value));
+                                               
$entity_list[$j][$cols_return_extra[$i]['name']]=date($GLOBALS['phpgw_data']['user']['preferences']['common']['dateformat'],strtotime($value));
                                        }
                                        else:
                                        {