This commit is contained in:
Alexander M. Turek
2002-12-06 19:06:04 +00:00
parent c6572ff01a
commit 9ca04ea101
3 changed files with 15 additions and 2 deletions

View File

@@ -16,6 +16,8 @@ $Source$
2002-12-06 Alexander M. Turek <rabus@users.sourceforge.net> 2002-12-06 Alexander M. Turek <rabus@users.sourceforge.net>
* lang/german.inc.php3: Updates. * lang/german.inc.php3: Updates.
* main.php3: Fixed bug #649641 (usernames containing '@' character). * main.php3: Fixed bug #649641 (usernames containing '@' character).
* libaraies/ob.lib.php3: Merged patch #647148 (Fix for Output Handler
warning / php >= 4.3.0) by Mats Engstrom (matseng).
2002-12-06 Marc Delisle <lem9@users.sourceforge.net> 2002-12-06 Marc Delisle <lem9@users.sourceforge.net>
* lang/*.php3, pdf_schema.php3, pdf_pages.php3, db_details_structure.php3: * lang/*.php3, pdf_schema.php3, pdf_pages.php3, db_details_structure.php3:

View File

@@ -2726,8 +2726,8 @@ enhancements, bugfixes or support for a new language since version 2.1.0:
Bora Alioglu, Ricardo ?, Sven-Erik Andersen, Alessandro Astarita, Bora Alioglu, Ricardo ?, Sven-Erik Andersen, Alessandro Astarita,
P&eacute;ter Bakondy, Borges Botelho, Olivier Bussier, Neil Darlow, P&eacute;ter Bakondy, Borges Botelho, Olivier Bussier, Neil Darlow,
Ian Davidson, Laurent Dhima, Kristof Hamann, Thomas Kl&auml;ger, Lubos Klokner, Mats Engstrom, Ian Davidson, Laurent Dhima, Kristof Hamann, Thomas Kl&auml;ger,
Martin Marconcini, Girish Nair, David Nordenberg, Andreas Pauley, Lubos Klokner, Martin Marconcini, Girish Nair, David Nordenberg, Andreas Pauley,
Bernard M. Piller, Laurent Haas, &quot;Sakamoto&quot;, Yuval Sarna, Bernard M. Piller, Laurent Haas, &quot;Sakamoto&quot;, Yuval Sarna,
www.securereality.com.au, Alvar Soome, Siu Sun, Peter Svec, Michael Tacelosky, www.securereality.com.au, Alvar Soome, Siu Sun, Peter Svec, Michael Tacelosky,
Rachim Tamsjadi, Kositer Uros, Lu<4C>s V., Martijn W. van der Lee, Rachim Tamsjadi, Kositer Uros, Lu<4C>s V., Martijn W. van der Lee,

View File

@@ -46,6 +46,17 @@ if (!defined('PMA_OB_LIB_INCLUDED')) {
} }
// End patch // End patch
// If output buffering is enabled in php.ini it's not possible to
// add the ob_gzhandler without a warning message from php 4.3.0.
// Being better safe than sorry, check for any existing output handler
// instead of just checking the 'output_buffering' setting.
//
if (PMA_PHP_INT_VERSION >= 40300 && @function_exists('ob_get_level')) {
if (ob_get_level() > 0) {
$mode = 0;
}
}
// Zero (0) is no mode or in other words output buffering is OFF. // 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. // Follow 2^0, 2^1, 2^2, 2^3 type values for the modes.
// Usefull if we ever decide to combine modes. Then a bitmask field of // Usefull if we ever decide to combine modes. Then a bitmask field of