[Phpgroupware-cvs] preferences preferences.php

[Dave Hall]

CVSROOT:        /cvsroot/phpgroupware
Module name:    preferences
Changes by:     Dave Hall <skwashd>     07/10/10 08:36:36

Modified files:
        .              : preferences.php 

Log message:
        fix notice

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

Patches:
Index: preferences.php
===================================================================
RCS file: /cvsroot/phpgroupware/preferences/preferences.php,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- preferences.php     25 Mar 2007 19:38:39 -0000      1.47
+++ preferences.php     10 Oct 2007 08:36:36 -0000      1.48
@@ -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.47 2007/03/25 19:38:39 sigurdne Exp 
$
+       * @version $Id: preferences.php,v 1.48 2007/10/10 08:36:36 skwashd Exp $
        */
 
        $GLOBALS['phpgw_info']['flags'] = array
@@ -523,12 +523,22 @@
        {
                $GLOBALS['type'] = 'user';
        }
-       $show_help = "$session_data[show_help]" != '' && 
$session_data['appname'] == $_GET['appname'] ? 
-               $session_data['show_help'] : 
intval($GLOBALS['phpgw_info']['user']['preferences']['common']['show_help']);
+
+       $show_help = true;
+       if ( isset($session_data['show_help']) 
+               && $session_data['show_help'] != '' 
+               && $session_data['appname'] == $_GET['appname'] )
+       {
+               $show_help = $session_data['show_help'];
+       }
+       else if ( 
isset($GLOBALS['phpgw_info']['user']['preferences']['common']['show_help']) )
+       {
+               $show_help = 
!!$GLOBALS['phpgw_info']['user']['preferences']['common']['show_help'];
+       }
 
        if ($toggle_help = get_var('toggle_help','POST'))
        {
-               $show_help = intval(!$show_help);
+               $show_help = !$show_help;
        }
        $has_help = 0;