diff options
Diffstat (limited to 'frontend/functions')
| -rw-r--r-- | frontend/functions/onshutdown.php | 14 | ||||
| -rw-r--r-- | frontend/functions/r_stripslashes.php | 3 |
2 files changed, 8 insertions, 9 deletions
diff --git a/frontend/functions/onshutdown.php b/frontend/functions/onshutdown.php index 60c2cb4..f144275 100644 --- a/frontend/functions/onshutdown.php +++ b/frontend/functions/onshutdown.php @@ -1,17 +1,17 @@ <?php function onshutdown($footerloc, $headerloc) { - global $S, $request, $conf, $death; + global $S; if (isset($S) && is_array($S) && !$S['notemplates']) { require_once($headerloc); - if ($death) { - echo $death; + if ($S['death']) { + echo $S['death']; } require_once($footerloc); - } elseif (isset($conf) && isset($S) && is_array($S) && isset($request) && isset($request['ajax'])) { - if (isset($death)) { - echo '<death_message>'.$death.'</death_message>'; + } elseif (isset($S['conf']) && isset($S) && is_array($S) && isset($_REQUEST) && isset($_REQUEST['ajax'])) { + if (isset($S['death'])) { + echo '<death_message>'.$S['death'].'</death_message>'; } - if ($conf['debug']) { + if ($S['conf']['debug']) { foreach ($S['debug'] as $row) { list($type, $text)=$row; echo '<debug>'; diff --git a/frontend/functions/r_stripslashes.php b/frontend/functions/r_stripslashes.php index 8d6dccb..a0679f0 100644 --- a/frontend/functions/r_stripslashes.php +++ b/frontend/functions/r_stripslashes.php @@ -3,11 +3,10 @@ function r_stripslashes(&$array) { debug('r_stripslashes', print_r($array, true)); foreach ($array as $key => $value) { if (is_array($value)) { - $array[$key]=r_stripslashes($value); + r_stripslashes($value); } elseif (is_string($value)) { $array[$key]=stripslashes($value); } } - return $array; } ?> |