|
@@ -1429,7 +1429,7 @@ function loadTheme($id_theme = 0, $initialize = true)
|
|
|
{
|
|
|
global $user_info, $user_settings, $board_info, $boarddir;
|
|
|
global $txt, $boardurl, $scripturl, $mbname, $modSettings;
|
|
|
- global $context, $settings, $options, $sourcedir, $ssi_theme, $smcFunc;
|
|
|
+ global $context, $settings, $options, $sourcedir, $ssi_theme, $smcFunc, $language;
|
|
|
|
|
|
|
|
|
if (!empty($id_theme))
|
|
@@ -1631,27 +1631,44 @@ function loadTheme($id_theme = 0, $initialize = true)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- $context['user'] = array(
|
|
|
- 'id' => $user_info['id'],
|
|
|
- 'is_logged' => !$user_info['is_guest'],
|
|
|
- 'is_guest' => &$user_info['is_guest'],
|
|
|
- 'is_admin' => &$user_info['is_admin'],
|
|
|
- 'is_mod' => &$user_info['is_mod'],
|
|
|
-
|
|
|
- 'can_mod' => allowedTo('access_mod_center') || (!$user_info['is_guest'] && ($user_info['mod_cache']['gq'] != '0=1' || $user_info['mod_cache']['bq'] != '0=1' || ($modSettings['postmod_active'] && !empty($user_info['mod_cache']['ap'])))),
|
|
|
- 'username' => $user_info['username'],
|
|
|
- 'language' => $user_info['language'],
|
|
|
- 'email' => $user_info['email'],
|
|
|
- 'ignoreusers' => $user_info['ignoreusers'],
|
|
|
- );
|
|
|
- if (!$context['user']['is_guest'])
|
|
|
- $context['user']['name'] = $user_info['name'];
|
|
|
- elseif ($context['user']['is_guest'] && !empty($txt['guest_title']))
|
|
|
- $context['user']['name'] = $txt['guest_title'];
|
|
|
+ if (!empty($user_info))
|
|
|
+ {
|
|
|
+ $context['user'] = array(
|
|
|
+ 'id' => $user_info['id'],
|
|
|
+ 'is_logged' => !$user_info['is_guest'],
|
|
|
+ 'is_guest' => &$user_info['is_guest'],
|
|
|
+ 'is_admin' => &$user_info['is_admin'],
|
|
|
+ 'is_mod' => &$user_info['is_mod'],
|
|
|
+
|
|
|
+ 'can_mod' => allowedTo('access_mod_center') || (!$user_info['is_guest'] && ($user_info['mod_cache']['gq'] != '0=1' || $user_info['mod_cache']['bq'] != '0=1' || ($modSettings['postmod_active'] && !empty($user_info['mod_cache']['ap'])))),
|
|
|
+ 'username' => $user_info['username'],
|
|
|
+ 'language' => $user_info['language'],
|
|
|
+ 'email' => $user_info['email'],
|
|
|
+ 'ignoreusers' => $user_info['ignoreusers'],
|
|
|
+ );
|
|
|
+ if (!$context['user']['is_guest'])
|
|
|
+ $context['user']['name'] = $user_info['name'];
|
|
|
+ elseif ($context['user']['is_guest'] && !empty($txt['guest_title']))
|
|
|
+ $context['user']['name'] = $txt['guest_title'];
|
|
|
|
|
|
-
|
|
|
- $user_info['smiley_set'] = (!in_array($user_info['smiley_set'], explode(',', $modSettings['smiley_sets_known'])) && $user_info['smiley_set'] != 'none') || empty($modSettings['smiley_sets_enable']) ? (!empty($settings['smiley_sets_default']) ? $settings['smiley_sets_default'] : $modSettings['smiley_sets_default']) : $user_info['smiley_set'];
|
|
|
- $context['user']['smiley_set'] = $user_info['smiley_set'];
|
|
|
+
|
|
|
+ $user_info['smiley_set'] = (!in_array($user_info['smiley_set'], explode(',', $modSettings['smiley_sets_known'])) && $user_info['smiley_set'] != 'none') || empty($modSettings['smiley_sets_enable']) ? (!empty($settings['smiley_sets_default']) ? $settings['smiley_sets_default'] : $modSettings['smiley_sets_default']) : $user_info['smiley_set'];
|
|
|
+ $context['user']['smiley_set'] = $user_info['smiley_set'];
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ $context['user'] = array(
|
|
|
+ 'id' => -1,
|
|
|
+ 'is_logged' => false,
|
|
|
+ 'is_guest' => true,
|
|
|
+ 'is_mod' => false,
|
|
|
+ 'can_mod' => false,
|
|
|
+ 'name' => $txt['guest_title'],
|
|
|
+ 'language' => $language,
|
|
|
+ 'email' => '',
|
|
|
+ 'ignoreusers' => array(),
|
|
|
+ );
|
|
|
+ }
|
|
|
|
|
|
|
|
|
if (!isset($context['html_headers']))
|
|
@@ -1678,7 +1695,7 @@ function loadTheme($id_theme = 0, $initialize = true)
|
|
|
$context['load_average'] = $modSettings['load_average'];
|
|
|
|
|
|
|
|
|
- $context['show_login_bar'] = $user_info['is_guest'] && !empty($modSettings['enableVBStyleLogin']);
|
|
|
+ $context['show_login_bar'] = !empty($user_info['is_guest']) && !empty($modSettings['enableVBStyleLogin']);
|
|
|
|
|
|
|
|
|
detectBrowser();
|