aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-04-29 01:18:57 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-04-29 01:18:57 +0000
commit7bc05c5e24ca632f3aa5dfd1fe1e6bd145f9d34c (patch)
tree9dc3802635b2309fa5f8cb96e46ac5cae4a88b00 /phpBB/includes/functions.php
parent656274cd5798ef9e62c23cdf0c3c1d66d612263d (diff)
downloadforums-7bc05c5e24ca632f3aa5dfd1fe1e6bd145f9d34c.tar
forums-7bc05c5e24ca632f3aa5dfd1fe1e6bd145f9d34c.tar.gz
forums-7bc05c5e24ca632f3aa5dfd1fe1e6bd145f9d34c.tar.bz2
forums-7bc05c5e24ca632f3aa5dfd1fe1e6bd145f9d34c.tar.xz
forums-7bc05c5e24ca632f3aa5dfd1fe1e6bd145f9d34c.zip
- fixing some bugs, containing fixes for anonymous username displays, eaccelerator issue, permission trace and a few smaller bugs.
git-svn-id: file:///svn/phpbb/trunk@5858 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions.php')
-rw-r--r--phpBB/includes/functions.php13
1 files changed, 9 insertions, 4 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 83e08a9d9a..4ccdc1b3ec 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -141,8 +141,8 @@ function unique_id($extra = 'c')
$val = $config['rand_seed'] . microtime();
$val = md5($val);
$config['rand_seed'] = md5($config['rand_seed'] . $val . $extra);
-
- if($dss_seeded !== true)
+
+ if ($dss_seeded !== true)
{
set_config('rand_seed', $config['rand_seed']);
$dss_seeded = true;
@@ -2194,7 +2194,12 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
echo ' <h1>General Error</h1>';
echo ' <h2>' . $msg_text . '</h2>';
- echo ' <p>Please notify the board administrator or webmaster : <a href="mailto:' . $config['board_contact'] . '">' . $config['board_contact'] . '</a></p>';
+
+ if (!empty($config['board_contact']))
+ {
+ echo ' <p>Please notify the board administrator or webmaster : <a href="mailto:' . $config['board_contact'] . '">' . $config['board_contact'] . '</a></p>';
+ }
+
echo ' </div>';
echo ' <span class="corners-bottom"><span></span></span>';
echo ' </div>';
@@ -2597,7 +2602,7 @@ function page_footer()
$db->sql_report('display');
}
- $debug_output = sprintf('Time : %.3fs | ' . $db->sql_num_queries() . ' Queries | GZIP : ' . (($config['gzip_compress']) ? 'On' : 'Off' ) . ' | Load : ' . (($user->load) ? $user->load : 'N/A'), $totaltime);
+ $debug_output = sprintf('Time : %.3fs | ' . $db->sql_num_queries() . ' Queries | GZIP : ' . (($config['gzip_compress']) ? 'On' : 'Off') . (($user->load) ? ' | Load : ' . $user->load : ''), $totaltime);
if ($auth->acl_get('a_') && defined('DEBUG_EXTRA'))
{