[Phpgroupware-cvs] phpgwapi/inc class.common.inc.php

[Sigurd Nes]

CVSROOT:        /sources/phpgwapi
Module name:    phpgwapi
Changes by:     Sigurd Nes <sigurdne>   07/04/08 17:41:53

Modified files:
        inc            : class.common.inc.php 

Log message:
        enable overriding apps for manual entries

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.common.inc.php?cvsroot=phpgwapi&r1=1.255&r2=1.256

Patches:
Index: class.common.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/class.common.inc.php,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -b -r1.255 -r1.256
--- class.common.inc.php        7 Mar 2007 22:29:31 -0000       1.255
+++ class.common.inc.php        8 Apr 2007 17:41:53 -0000       1.256
@@ -8,7 +8,7 @@
        * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General 
Public License
        * @package phpgwapi
        * @subpackage utilities
-       * @version $Id: class.common.inc.php,v 1.255 2007/03/07 22:29:31 
sigurdne Exp $
+       * @version $Id: class.common.inc.php,v 1.256 2007/04/08 17:41:53 
sigurdne Exp $
        */
 
        /**
@@ -1064,7 +1064,10 @@
                        }
 
                        // We handle this here becuase its special
-                       $GLOBALS['phpgw_info']['navbar']['manual']['url']   = 
"javascript:openwindow('" . $GLOBALS['phpgw']->link('/index.php', 
array('menuaction'=> 'manual.uimanual.help', 'app' => $app, 'section' => 
isset($GLOBALS['phpgw_info']['apps']['manual']['section'])?$GLOBALS['phpgw_info']['apps']['manual']['section']:''))
 . "','700','600')";
+                       if(isset($GLOBALS['phpgw_info']['navbar']['manual']))
+                       {
+                               
$GLOBALS['phpgw_info']['navbar']['manual']['url']   = "javascript:openwindow('" 
. $GLOBALS['phpgw']->link('/index.php', array('menuaction'=> 
'manual.uimanual.help', 'app' => 
isset($GLOBALS['phpgw_info']['apps']['manual']['app']) && 
$GLOBALS['phpgw_info']['apps']['manual']['app'] ? 
$GLOBALS['phpgw_info']['apps']['manual']['app'] : $app, 'section' => 
isset($GLOBALS['phpgw_info']['apps']['manual']['section'])?$GLOBALS['phpgw_info']['apps']['manual']['section']:''))
 . "','700','600')";
+                       }
                        
                        $GLOBALS['phpgw_info']['navbar']['about']['title'] = 
lang('About %1', $app_title);
                        $GLOBALS['phpgw_info']['navbar']['about']['url']   = 
$GLOBALS['phpgw']->link('/about.php', array('app' => $app) );