mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-23 17:34:56 +02:00
Code Issues Projects Releases Wiki Activity

MDL-9959 debugging() shows warnings when called from call_user_func() functions

Browse Source 
MDL-9958 addslashes_recursive() and stripslashes_recursive() modifies function parameter in PHP5
This commit is contained in:
skodak 2007-05-27 22:55:52 +00:00
parent 36938e1a67
commit 271c7a98bc
1 changed files with 36 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
lib/weblib.php
View File

@ -497,21 +497,27 @@ function stripslashes_safe($mixed) {
* @return mixed
*/
function stripslashes_recursive($var) {
if(is_object($var)) {
if (is_object($var)) {
$new_var = new object();
$properties = get_object_vars($var);
foreach($properties as $property => $value) {
$var->$property = stripslashes_recursive($value);
$new_var->$property = stripslashes_recursive($value);
}
}
else if(is_array($var)) {
} else if(is_array($var)) {
$new_var = array();
foreach($var as $property => $value) {
$var[$property] = stripslashes_recursive($value);
$new_var[$property] = stripslashes_recursive($value);
}
} else if(is_string($var)) {
$new_var = stripslashes($var);
} else {
$new_var = $var;
}
else if(is_string($var)) {
$var = stripslashes($var);
}
return $var;
return $new_var;
}
/**
@ -526,21 +532,27 @@ function stripslashes_recursive($var) {
* @return mixed
*/
function addslashes_recursive($var) {
if(is_object($var)) {
if (is_object($var)) {
$new_var = new object();
$properties = get_object_vars($var);
foreach($properties as $property => $value) {
$var->$property = addslashes_recursive($value);
$new_var->$property = addslashes_recursive($value);
}
}
else if(is_array($var)) {
} else if (is_array($var)) {
$new_var = array();
foreach($var as $property => $value) {
$var[$property] = addslashes_recursive($value);
$new_var[$property] = addslashes_recursive($value);
}
} else if (is_string($var)) {
$new_var = addslashes($var);
} else {
$new_var = $var;
}
else if(is_string($var)) {
$var = addslashes($var);
}
return $var;
return $new_var;
}
/**
@ -6157,6 +6169,12 @@ function debugging($message='', $level=DEBUG_NORMAL) {
$callers = debug_backtrace();
$from = '<ul style="text-align: left">';
foreach ($callers as $caller) {
if (!isset($caller['line'])) {
$caller['line'] = '?'; // probably call_user_func()
}
if (!isset($caller['file'])) {
$caller['file'] = $CFG->dirroot.'/unknownfile'; // probably call_user_func()
}
$from .= '<li>line ' . $caller['line'] . ' of ' . substr($caller['file'], strlen($CFG->dirroot) + 1);
if (isset($caller['function'])) {
$from .= ': call to ';