more PHP6 compatibility

This commit is contained in:
Marc Delisle
2007-06-15 15:46:53 +00:00
parent e1bd91f914
commit 8d23f41628
2 changed files with 14 additions and 9 deletions

View File

@@ -332,7 +332,9 @@ chmod o-rw config.inc.php # remove world read and write permissions
<p> Simply copy <i>./config.inc.php</i> from your previous installation into the newly <p> Simply copy <i>./config.inc.php</i> from your previous installation into the newly
unpacked one. Configuration files from very old versions (2.3.0 or before) may unpacked one. Configuration files from very old versions (2.3.0 or before) may
require some tweaking as some options have been changed or removed.</p> require some tweaking as some options have been changed or removed.
For compatibility with PHP 6, remove a <tt>set_magic_quotes_runtime(0);</tt>
statement that you might find near the end of your configuration file.</p>
<p> You should <strong>not</strong> copy <tt>libraries/config.default.php</tt> <p> You should <strong>not</strong> copy <tt>libraries/config.default.php</tt>
over <tt>config.inc.php</tt> because the default configuration file over <tt>config.inc.php</tt> because the default configuration file

View File

@@ -48,15 +48,18 @@ if (defined('E_STRICT')) {
unset($old_error_reporting); unset($old_error_reporting);
} }
/** // at this point PMA_PHP_INT_VERSION is not yet defined
* Avoid object cloning errors if (version_compare(phpversion(), '6', 'lt')) {
*/ /**
@ini_set('zend.ze1_compatibility_mode', false); * Avoid object cloning errors
*/
@ini_set('zend.ze1_compatibility_mode', false);
/** /**
* Avoid problems with magic_quotes_runtime * Avoid problems with magic_quotes_runtime
*/ */
@ini_set('magic_quotes_runtime', false); @ini_set('magic_quotes_runtime', false);
}
/** /**
* core functions * core functions