Hack around with smiley_set magick: force everyone to use default

This commit is contained in:
Aleksei Miheev
2014-01-05 12:56:49 +00:00
parent 6a5184e08c
commit f593337286

View File

@@ -180,7 +180,7 @@ function loadUserSettings()
'url' => isset($user_settings['avatar']) ? $user_settings['avatar'] : '',
'ID_ATTACH' => isset($user_settings['ID_ATTACH']) ? $user_settings['ID_ATTACH'] : 0
),
'smiley_set' => isset($user_settings['smileySet']) ? $user_settings['smileySet'] : '',
'smiley_set' => 'default',
'messages' => empty($user_settings['instantMessages']) ? 0 : $user_settings['instantMessages'],
'unread_messages' => empty($user_settings['unreadMessages']) ? 0 : $user_settings['unreadMessages'],
'total_time_logged_in' => empty($user_settings['totalTimeLoggedIn']) ? 0 : $user_settings['totalTimeLoggedIn'],
@@ -762,7 +762,7 @@ function loadTheme($ID_THEME = 0, $initialize = true)
);
// Determine the current 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'];
$user_info['smiley_set'] = 'default';
// Some basic information...
if (!isset($context['html_headers']))