diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-10-31 12:09:51 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-10-31 12:09:51 +0000 |
| commit | da3121c0fd93ccdf26bcd0440f8f1059c7651e34 (patch) | |
| tree | 91a0b5fc96e5a0454646d2d1445279635916343e | |
| parent | 29f583c626d27cba7591238eb70433553cab9219 (diff) | |
| download | forums-da3121c0fd93ccdf26bcd0440f8f1059c7651e34.tar forums-da3121c0fd93ccdf26bcd0440f8f1059c7651e34.tar.gz forums-da3121c0fd93ccdf26bcd0440f8f1059c7651e34.tar.bz2 forums-da3121c0fd93ccdf26bcd0440f8f1059c7651e34.tar.xz forums-da3121c0fd93ccdf26bcd0440f8f1059c7651e34.zip | |
doubleval for load config, session to user var name change
git-svn-id: file:///svn/phpbb/trunk@2994 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/includes/page_tail.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/session.php | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/page_tail.php b/phpBB/includes/page_tail.php index b39f540210..732640f09c 100644 --- a/phpBB/includes/page_tail.php +++ b/phpBB/includes/page_tail.php @@ -36,7 +36,7 @@ if (defined('DEBUG')) exit; } - $debug_output = sprintf('<br /><br />[ Time : %.3fs | ' . $db->sql_num_queries() . ' Queries | GZIP : ' . ( ( $config['gzip_compress'] ) ? 'On' : 'Off' ) . ' | Load : ' . (($session->load) ? $session->load : 'N/A'), $totaltime); + $debug_output = sprintf('<br /><br />[ Time : %.3fs | ' . $db->sql_num_queries() . ' Queries | GZIP : ' . ( ( $config['gzip_compress'] ) ? 'On' : 'Off' ) . ' | Load : ' . (($user->load) ? $user->load : 'N/A'), $totaltime); if ($auth->acl_get('a_')) { @@ -47,7 +47,7 @@ if (defined('DEBUG')) $template->assign_vars(array( 'PHPBB_VERSION' => $config['version'], - 'ADMIN_LINK' => ( $auth->acl_get('a_') ) ? '<a href="' . "admin/index.$phpEx?sid=" . $user->data['session_id'] . '">' . $user->lang['Admin_panel'] . '</a><br /><br />' : '', + 'ADMIN_LINK' => ($auth->acl_get('a_')) ? '<a href="' . "admin/index.$phpEx?sid=" . $user->data['session_id'] . '">' . $user->lang['Admin_panel'] . '</a><br /><br />' : '', 'DEBUG_OUTPUT' => (defined('DEBUG')) ? $debug_output : '' )); diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index 710432e162..845537962f 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -64,13 +64,13 @@ class session } // Load limit check (if applicable) - if ( intval($config['limit_load']) && file_exists('/proc/loadavg') ) + if ( doubleval($config['limit_load']) && file_exists('/proc/loadavg') ) { if ( $load = @file('/proc/loadavg') ) { list($this->load) = explode(' ', $load[0]); - if ( $this->load > intval($config['limit_load']) ) + if ( $this->load > doubleval($config['limit_load']) ) { trigger_error('Board_unavailable'); } |