From 91488af08f31ea848696c491140c8be1f0c15898 Mon Sep 17 00:00:00 2001
From: rurban <rurban@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Thu, 14 Feb 2008 18:31:04 +0000
Subject: [PATCH] nocache to omit compress cache headers (fix async calls for
 rating images)

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@5983 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 lib/Request.php | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/lib/Request.php b/lib/Request.php
index 8e72339fa..f82a92846 100644
--- a/lib/Request.php
+++ b/lib/Request.php
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-rcs_id('$Id: Request.php,v 1.115 2007-09-01 13:28:34 rurban Exp $');
+rcs_id('$Id: Request.php,v 1.116 2008-02-14 18:31:04 rurban Exp $');
 /*
  Copyright (C) 2002,2004,2005,2006 $ThePhpWikiProgrammingTeam
  
@@ -106,6 +106,11 @@ class Request {
         if ($args)
             $get_args = array_merge($get_args, $args);
 
+        // leave out empty arg values
+        foreach ($get_args as $g => $v) {
+            if ($v === false or $v === '') unset($get_args[$g]);
+        }
+
         // Err... good point...
         // sortby buttons
         if ($this->isPost()) {
@@ -339,7 +344,7 @@ class Request {
         elseif (isCGI()) // necessary?
             $compress = false;
             
-        if ($this->getArg('start_debug'))
+        if ($this->getArg('start_debug') or $this->getArg('nocache'))
             $compress = false;
         
         // Should we compress even when apache_note is not available?
@@ -402,7 +407,7 @@ class Request {
 
     function discardOutput() {
         if (!empty($this->_is_buffering_output)) {
-            ob_clean();
+            if (ob_get_length()) ob_clean();
             $this->_is_buffering_output = false;
         } else {
             trigger_error("Not buffering output", E_USER_NOTICE);
@@ -1349,6 +1354,9 @@ class HTTP_ValidatorSet {
 
 
 // $Log: not supported by cvs2svn $
+// Revision 1.115  2007/09/01 13:28:34  rurban
+// document pear DB problem
+//
 // Revision 1.114  2007/07/14 19:17:15  rurban
 // fix bug#1749950 float with ","
 //
-- 
2.45.0