aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-03-17 12:51:32 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-03-17 12:51:32 +0000
commit4962db5f6715210d4e577fa843f82ffe61b47bc4 (patch)
treebba382a22c3dba0ae7548c62c32348f11e7e7dd5 /phpBB/includes/functions.php
parent59ba11f18f9b43fc154018923c20dcc17db8ffa7 (diff)
downloadforums-4962db5f6715210d4e577fa843f82ffe61b47bc4.tar
forums-4962db5f6715210d4e577fa843f82ffe61b47bc4.tar.gz
forums-4962db5f6715210d4e577fa843f82ffe61b47bc4.tar.bz2
forums-4962db5f6715210d4e577fa843f82ffe61b47bc4.tar.xz
forums-4962db5f6715210d4e577fa843f82ffe61b47bc4.zip
- fix some bugs...
git-svn-id: file:///svn/phpbb/trunk@5643 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions.php')
-rw-r--r--phpBB/includes/functions.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 57aa3f9593..e0fb5e51f2 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -2295,7 +2295,7 @@ function page_footer()
$template->assign_vars(array(
'DEBUG_OUTPUT' => (defined('DEBUG')) ? $debug_output : '',
- 'U_ACP' => ($auth->acl_get('a_') && $user->data['is_registered']) ? "{$phpbb_root_path}adm/index.$phpEx?sid=" . $user->data['session_id'] : '')
+ 'U_ACP' => ($auth->acl_get('a_') && $user->data['is_registered']) ? "{$phpbb_root_path}adm/index.$phpEx?sid=" . $user->session_id : '')
);
// Call cron-type script
@@ -2419,6 +2419,9 @@ function get_backtrace()
}
}
+ $trace['class'] = (!isset($trace['class'])) ? '' : $trace['class'];
+ $trace['type'] = (!isset($trace['type'])) ? '' : $trace['type'];
+
$output .= '<br />';
$output .= '<b>FILE:</b> ' . htmlspecialchars($trace['file']) . '<br />';
$output .= '<b>LINE:</b> ' . $trace['line'] . '<br />';