From f593337286f9b5764a857acc5705985b9bb200d1 Mon Sep 17 00:00:00 2001 From: Aleksei Miheev Date: Sun, 5 Jan 2014 12:56:49 +0000 Subject: [PATCH] Hack around with smiley_set magick: force everyone to use default --- Sources/Load.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Sources/Load.php b/Sources/Load.php index c5ff37e..6c45226 100644 --- a/Sources/Load.php +++ b/Sources/Load.php @@ -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']))