The branch, master has been updated
via 621d851c5f0dcf063af2120f8984773e580d7a84 (commit)
from 79f320e95104ba4017d1ad78b81c3964c7df4871 (commit)
- Log -----------------------------------------------------------------
commit 621d851c5f0dcf063af2120f8984773e580d7a84
Author: Marc Delisle <[email protected]>
Date: Sat Dec 4 07:02:06 2010 -0500
zend.ze1_compatibility_mode removed in PHP 5.3
-----------------------------------------------------------------------
Summary of changes:
libraries/common.inc.php | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index dda4b95..1a140bb 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -57,20 +57,25 @@ require './libraries/Error_Handler.class.php';
$GLOBALS['error_handler'] = new PMA_Error_Handler();
$cfg['Error_Handler']['display'] = TRUE;
-// at this point PMA_PHP_INT_VERSION is not yet defined
-if (version_compare(phpversion(), '6', 'lt')) {
+/*
+ * This setting was removed in PHP 5.3. But at this point PMA_PHP_INT_VERSION
+ * is not yet defined so we use another way to find out the PHP version.
+ */
+if (version_compare(phpversion(), '5.3', 'lt')) {
/**
* Avoid object cloning errors
*/
@ini_set('zend.ze1_compatibility_mode', false);
-
- /**
- * Avoid problems with magic_quotes_runtime
- */
- @ini_set('magic_quotes_runtime', false);
}
/**
+ * Avoid problems with magic_quotes_runtime
+ * (in the future, this setting will be removed but it's not yet
+ * known in which PHP version)
+ */
+...@ini_set('magic_quotes_runtime', false);
+
+/**
* for verification in all procedural scripts under libraries
*/
define('PHPMYADMIN', true);
hooks/post-receive
--
phpMyAdmin
------------------------------------------------------------------------------
What happens now with your Lotus Notes apps - do you make another costly
upgrade, or settle for being marooned without product support? Time to move
off Lotus Notes and onto the cloud with Force.com, apps are easier to build,
use, and manage than apps on traditional platforms. Sign up for the Lotus
Notes Migration Kit to learn more. http://p.sf.net/sfu/salesforce-d2d
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
