[Phpgroupware-cvs] preferences preferences.php

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    preferences
Changes by:     Sigurd Nes <sigurdne>   07/02/26 19:26:58

Modified files:
        .              : preferences.php 

Log message:
        notice

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/preferences/preferences.php?cvsroot=phpgroupware&r1=1.45&r2=1.46

Patches:
Index: preferences.php
===================================================================
RCS file: /sources/phpgroupware/preferences/preferences.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- preferences.php     25 Feb 2007 22:00:37 -0000      1.45
+++ preferences.php     26 Feb 2007 19:26:58 -0000      1.46
@@ -5,7 +5,7 @@
        * @copyright Copyright (C) 2000-2006 Free Software Foundation, Inc. 
http://www.fsf.org/
        * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
        * @package preferences
-       * @version $Id: preferences.php,v 1.45 2007/02/25 22:00:37 sigurdne Exp 
$
+       * @version $Id: preferences.php,v 1.46 2007/02/26 19:26:58 sigurdne Exp 
$
        */
 
        $GLOBALS['phpgw_info']['flags'] = array
@@ -373,7 +373,7 @@
 
                if ($GLOBALS['type'] == 'user')
                {
-                       $def_text = 
!isset($GLOBALS['phpgw']->preferences->user[$_appname][$name]) || 
!$GLOBALS['phpgw']->preferences->user[$_appname][$name] ? 
$GLOBALS['phpgw']->preferences->data[$_appname][$name] : 
(isset($GLOBALS['phpgw']->preferences->default[$_appname][$name])?$GLOBALS['phpgw']->preferences->default[$_appname][$name]:'');
+                       $def_text = 
!isset($GLOBALS['phpgw']->preferences->user[$_appname][$name]) || 
!$GLOBALS['phpgw']->preferences->user[$_appname][$name] ? 
(isset($GLOBALS['phpgw']->preferences->data[$_appname][$name])?$GLOBALS['phpgw']->preferences->data[$_appname][$name]:'')
 : 
(isset($GLOBALS['phpgw']->preferences->default[$_appname][$name])?$GLOBALS['phpgw']->preferences->default[$_appname][$name]:'');
 
                        if (isset($notifys[$name]))     // translate the 
substitution names
                        {