bug #1905711 [compatibility] Functions deprecated in PHP 5.3

This commit is contained in:
Marc Delisle
2008-03-03 13:51:34 +00:00
parent 4fa47d5e65
commit 481baeb24b
3 changed files with 5 additions and 4 deletions

View File

@@ -7,6 +7,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
2.11.6.0 (not yet released) 2.11.6.0 (not yet released)
- bug #1903724 [interface] Displaying of very large queries in error message - bug #1903724 [interface] Displaying of very large queries in error message
- bug #1905711 [compatibility] Functions deprecated in PHP 5.3: is_a() and
get_magic_quotes_gpc(), thanks to Dmitry N. Shilnikov - yrtimd
2.11.5.0 (2008-03-01) 2.11.5.0 (2008-03-01)
- bug #1862661 [GUI] Warn about rename deleting database - bug #1862661 [GUI] Warn about rename deleting database

View File

@@ -222,7 +222,8 @@ if (isset($_POST['usesubform'])) {
// end check if a subform is submitted // end check if a subform is submitted
// remove quotes added by php // remove quotes added by php
if (function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc()) { // (@ before get_magic_quotes_gpc() because it's deprecated in PHP 5.3)
if (function_exists('get_magic_quotes_gpc') && @get_magic_quotes_gpc()) {
PMA_arrayWalkRecursive($_GET, 'stripslashes', true); PMA_arrayWalkRecursive($_GET, 'stripslashes', true);
PMA_arrayWalkRecursive($_POST, 'stripslashes', true); PMA_arrayWalkRecursive($_POST, 'stripslashes', true);
PMA_arrayWalkRecursive($_COOKIE, 'stripslashes', true); PMA_arrayWalkRecursive($_COOKIE, 'stripslashes', true);

View File

@@ -326,15 +326,13 @@ function PMA_DBI_fetch_row($result)
* @uses mysqli_result * @uses mysqli_result
* @uses func_get_args() * @uses func_get_args()
* @uses is_object() * @uses is_object()
* @uses is_a()
* @uses mysqli_free_result() * @uses mysqli_free_result()
* @param result $result,... one or more mysql result resources * @param result $result,... one or more mysql result resources
*/ */
function PMA_DBI_free_result() function PMA_DBI_free_result()
{ {
foreach (func_get_args() as $result) { foreach (func_get_args() as $result) {
if (is_object($result) if ($result instanceof mysqli_result) {
&& is_a($result, 'mysqli_result')) {
mysqli_free_result($result); mysqli_free_result($result);
} }
} }