skwashd

Index: phpgwapi/inc/class.xslttemplates.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.xslttemplates.inc.php,v
retrieving revision 1.31
diff -u -r1.31 class.xslttemplates.inc.php
--- phpgwapi/inc/class.xslttemplates.inc.php    3 Sep 2006 06:15:27 -0000       1.31
+++ phpgwapi/inc/class.xslttemplates.inc.php    25 Sep 2006 14:48:30 -0000
@@ -275,12 +275,12 @@
 
                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(!$wml_out || (!isset($GLOBALS['phpgw_info']['flags']['noframework']) || !$GLOBALS['phpgw_info']['flags']['noframework']) )
                        {
                                $GLOBALS['phpgw']->common->phpgw_header($output_header);
                        }