diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-12-28 23:30:09 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-12-28 23:30:09 +0000 |
| commit | 19aed179e53f9660a7202e2e50816e1cef0f7be9 (patch) | |
| tree | e2707fd68720f206c88f8bcaff6e2fc3173c9c94 /phpBB/ucp.php | |
| parent | 4ded6cf5eef0892f9ef1d7351664e1d78445c419 (diff) | |
| download | forums-19aed179e53f9660a7202e2e50816e1cef0f7be9.tar forums-19aed179e53f9660a7202e2e50816e1cef0f7be9.tar.gz forums-19aed179e53f9660a7202e2e50816e1cef0f7be9.tar.bz2 forums-19aed179e53f9660a7202e2e50816e1cef0f7be9.tar.xz forums-19aed179e53f9660a7202e2e50816e1cef0f7be9.zip | |
$config to phpbb::$config
git-svn-id: file:///svn/phpbb/trunk@9242 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/ucp.php')
| -rw-r--r-- | phpBB/ucp.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/ucp.php b/phpBB/ucp.php index eabe067479..dfa640b388 100644 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -124,7 +124,7 @@ switch ($mode) $template->assign_vars(array( 'S_AGREEMENT' => true, 'AGREEMENT_TITLE' => $user->lang[$title], - 'AGREEMENT_TEXT' => sprintf($user->lang[$message], $config['sitename'], generate_board_url()), + 'AGREEMENT_TEXT' => sprintf($user->lang[$message], phpbb::$config['sitename'], generate_board_url()), 'U_BACK' => append_sid('ucp', 'mode=login'), 'L_BACK' => $user->lang['BACK_TO_LOGIN']) ); @@ -143,7 +143,7 @@ switch ($mode) $cookies = phpbb_request::variable_names(phpbb_request::COOKIE); foreach ($cookies as $cookie_name) { - $cookie_name = str_replace($config['cookie_name'] . '_', '', $cookie_name); + $cookie_name = str_replace(phpbb::$config['cookie_name'] . '_', '', $cookie_name); // Polls are stored as {cookie_name}_poll_{topic_id}, cookie_name_ got removed, therefore checking for poll_ if (strpos($cookie_name, 'poll_') !== 0) @@ -257,7 +257,7 @@ switch ($mode) } // Do not display subscribed topics/forums if not allowed - if (!$config['allow_topic_notify'] && !$config['allow_forum_notify']) + if (!phpbb::$config['allow_topic_notify'] && !phpbb::$config['allow_forum_notify']) { $module->set_display('main', 'subscribed', false); } @@ -282,9 +282,9 @@ switch ($mode) */ function _display_friends() { - global $config, $db, $template, $user, $auth; + global $db, $template, $user, $auth; - $update_time = $config['load_online_time'] * 60; + $update_time = phpbb::$config['load_online_time'] * 60; $sql = $db->sql_build_query('SELECT_DISTINCT', array( 'SELECT' => 'u.user_id, u.username, u.username_clean, u.user_colour, MAX(s.session_time) as online_time, MIN(s.session_viewonline) AS viewonline', |