[Tikiwiki-cvs] tiki tiki-setup.php, 1.240.2.149, 1.240.2.150 tiki-download_file.php, 1.17.2.7, 1.17.2.8

[<sy...@us...>]

Update of /cvsroot/tikiwiki/tiki
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv26869

Modified Files:
      Tag: BRANCH-1-9
	tiki-setup.php tiki-download_file.php 
Log Message:
[FIX] to be able to download some zip files on FF  if 'use gzipped output'is checked' (seems that a zip on a zip is not working) 

Index: tiki-setup.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-setup.php,v
retrieving revision 1.240.2.149
retrieving revision 1.240.2.150
diff -u -d -r1.240.2.149 -r1.240.2.150
--- tiki-setup.php	19 Mar 2007 13:08:08 -0000	1.240.2.149
+++ tiki-setup.php	25 Apr 2007 14:32:54 -0000	1.240.2.150
@@ -238,6 +238,7 @@
 $feature_referer_highlight = 'n';
 
 include_once ("tiki-setup_base.php");
+
 TikiSetup::check($tikidomain);
 //print("tiki-setup: before rest of tiki-setup:".$tiki_timer->elapsed()."<br />");
 
@@ -1882,13 +1883,11 @@
     $smarty->assign('gzip','Enabled');
     $smarty->assign('gzip_handler','php');
 // if not, check if tiki compression is enabled
-} elseif ($feature_obzip == 'y') {
+} elseif ($feature_obzip == 'y' && (empty($output_zip) || $output_zip != 'n')) {
 	// tiki compression is enabled, then let activate the handler
-	if ($feature_obzip == 'y') {
-	    ob_start ("ob_gzhandler");
-			$smarty->assign('gzip_handler','tiki');
-    	$smarty->assign('gzip','Enabled');
-	}
+	ob_start ("ob_gzhandler");
+	$smarty->assign('gzip_handler','tiki');
+	$smarty->assign('gzip','Enabled');
 }
 
 //print("tiki-setup: before include debugger.php:".$tiki_timer->elapsed()."<br />");

Index: tiki-download_file.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-download_file.php,v
retrieving revision 1.17.2.7
retrieving revision 1.17.2.8
diff -u -d -r1.17.2.7 -r1.17.2.8
--- tiki-download_file.php	9 Apr 2007 13:36:51 -0000	1.17.2.7
+++ tiki-download_file.php	25 Apr 2007 14:32:54 -0000	1.17.2.8
@@ -1,6 +1,7 @@
 <?php
 // CVS: $Id$
 // Initialization
+$output_zip = 'n';
 require_once('tiki-setup.php');
 include_once ('lib/stats/statslib.php');