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

[Dave Hall]

CVSROOT:        /cvsroot/phpgwapi
Module name:    phpgwapi
Changes by:     Dave Hall <skwashd>     06/09/25 15:34:15

Modified files:
        inc            : class.xslttemplates.inc.php 

Log message:
        make nonavbar work again, as it has its place

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.xslttemplates.inc.php?cvsroot=phpgwapi&r1=1.31&r2=1.32

Patches:
Index: class.xslttemplates.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.xslttemplates.inc.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- class.xslttemplates.inc.php 3 Sep 2006 06:15:27 -0000       1.31
+++ class.xslttemplates.inc.php 25 Sep 2006 15:34:15 -0000      1.32
@@ -8,7 +8,7 @@
        * @license http://www.gnu.org/licenses/lpl.html GNU General Public 
License
        * @package phpgwapi
        * @subpackage gui
-       * @version $Id: class.xslttemplates.inc.php,v 1.31 2006/09/03 06:15:27 
skwashd Exp $
+       * @version $Id: class.xslttemplates.inc.php,v 1.32 2006/09/25 15:34:15 
skwashd Exp $
        */
 
        if( (floor(phpversion()) == 4 && !extension_loaded('xslt') )
@@ -275,12 +275,13 @@
 
                function parse($parsexsl = True, $parsexml = True)
                {
-                       $output_header = 
!(isset($GLOBALS['phpgw_info']['flags']['noframework']) && 
$GLOBALS['phpgw_info']['flags']['noframework']);
+                       $output_header = 
isset($GLOBALS['phpgw_info']['flags']['nonavbar']) && 
$GLOBALS['phpgw_info']['flags']['nonavbar'];
                        
                        // Determine whether the browser is wml-capable or not
                        $wml_out = execMethod('phpgwapi.browser.is_mobile');
                        
-                       if(!$wml_out)
+                       if( 
!(isset($GLOBALS['phpgw_info']['flags']['noframework']) && 
!$GLOBALS['phpgw_info']['flags']['noframework']) 
+                               || !$wml_out)
                        {
                                
$GLOBALS['phpgw']->common->phpgw_header($output_header);
                        }