From beb2ecb8dd8eb7d1f96006d9c11672b20f7fa19f Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Fri, 3 Aug 2001 22:57:58 +0000
Subject: [PATCH] bug 445348

---
 ChangeLog       |  3 +++
 ob_lib.inc.php3 | 14 ++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index febada456..a11db7577 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,6 +27,9 @@ $Source$
 
 2001-08-03  Marc Delisle  <lem9@users.sourceforge.net>
 	* tbl_change.php3: current value of enums was lost.
+	* bug 445348, if ob_gzhandler already set in php.ini,
+	  patch by Garth Gillespie, modified by me
+
 
 2001-08-03  Steve Alberty  <alberty@neptunlabs.de>
 	* tbl_properties.php3, db_details.php3: fixed problems with table
diff --git a/ob_lib.inc.php3 b/ob_lib.inc.php3
index 03455d02f..c730b4609 100644
--- a/ob_lib.inc.php3
+++ b/ob_lib.inc.php3
@@ -23,6 +23,20 @@ if (!defined('__OB_LIB_INC__')) {
     else
       $mode = 0;
 
+/*
+ * If a user sets the output_handler in php.ini to ob_gzhandler, then 
+ * any right frame file in phpMyAdmin will not be handled properly by the 
+ * browser. My fix was to check the ini file within the 
+ * out_buffer_mode_get() function. 
+ *
+ * (Patch by Garth Gillespie, modified by Marc Delisle)
+ */
+
+    if (ini_get('output_handler') == 'ob_gzhandler') 
+       $mode = 0; 
+
+// End patch
+
     # Zero (0) is no mode or in other words output buffering is OFF.
 
     # Follow 2^0, 2^1, 2^2, 2^3 type values for the modes.