[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] [19104] Fix preferences notices
From: |
Caeies |
Subject: |
[Phpgroupware-cvs] [19104] Fix preferences notices |
Date: |
Wed, 11 Mar 2009 16:04:31 +0000 |
Revision: 19104
http://svn.sv.gnu.org/viewvc/?view=rev&root=phpgroupware&revision=19104
Author: Caeies
Date: 2009-03-11 16:04:30 +0000 (Wed, 11 Mar 2009)
Log Message:
-----------
Fix preferences notices
Modified Paths:
--------------
core/trunk/preferences/preferences.php
Modified: core/trunk/preferences/preferences.php
===================================================================
--- core/trunk/preferences/preferences.php 2009-03-11 16:03:31 UTC (rev
19103)
+++ core/trunk/preferences/preferences.php 2009-03-11 16:04:30 UTC (rev
19104)
@@ -147,7 +147,10 @@
$default = '';
if (isset($prefs[$name]) || $GLOBALS['type'] != 'user')
{
- $default = $prefs[$name];
+ if(isset($prefs[$name]))
+ {
+ $default = $prefs[$name];
+ }
}
if ($GLOBALS['type'] == 'user')
@@ -320,7 +323,14 @@
{
$vars += $vars2;
}
- $prefs[$name] =
$GLOBALS['phpgw']->preferences->lang_notify($prefs[$name],$vars);
+ if(isset($prefs[$name]))
+ {
+ $prefs[$name] =
$GLOBALS['phpgw']->preferences->lang_notify($prefs[$name],$vars);
+ }
+ else
+ {
+ $prefs[$name] = '';
+ }
$notifys[$name] = $vars; // this gets saved in the
app_session for re-translation
@@ -371,7 +381,7 @@
{
$default = $prefs[$name];
}
-
+ $def_text = '';
if ($GLOBALS['type'] == 'user')
{
$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]:'');
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] [19104] Fix preferences notices,
Caeies <=