1 files changed, 28 insertions, 5 deletions
diff --git a/phpBB/phpbb/user.php b/phpBB/phpbb/user.php
index b2ab187a70..18b7a3d096 100644
--- a/phpBB/phpbb/user.php
+++ b/phpBB/phpbb/user.php
@@ -143,9 +143,17 @@ class user extends \phpbb\session
 		* 					that are absolutely needed globally using this
 		* 					event. Use local events otherwise.
 		* @var	mixed	style_id			Style we are going to display
-		* @since 3.1-A1
+		* @since 3.1.0-a1
 		*/
-		$vars = array('user_data', 'user_lang_name', 'user_date_format', 'user_timezone', 'lang_set', 'lang_set_ext', 'style_id');
+		$vars = array(
+			'user_data',
+			'user_lang_name',
+			'user_date_format',
+			'user_timezone',
+			'lang_set',
+			'lang_set_ext',
+			'style_id',
+		);
 		extract($phpbb_dispatcher->trigger_event('core.user_setup', compact($vars)));
 
 		$this->data = $user_data;
@@ -183,7 +191,7 @@ class user extends \phpbb\session
 		unset($lang_set_ext);
 
 		$style_request = request_var('style', 0);
-		if ($style_request && $auth->acl_get('a_styles') && !defined('ADMIN_START'))
+		if ($style_request && (!$config['override_user_style'] || $auth->acl_get('a_styles')) && !defined('ADMIN_START'))
 		{
 			global $SID, $_EXTRA_URL;
 
@@ -204,6 +212,19 @@ class user extends \phpbb\session
 		$this->style = $db->sql_fetchrow($result);
 		$db->sql_freeresult($result);
 
+		// Fallback to user's standard style
+		if (!$this->style && $style_id != $this->data['user_style'])
+		{
+			$style_id = $this->data['user_style'];
+
+			$sql = 'SELECT *
+				FROM ' . STYLES_TABLE . " s
+				WHERE s.style_id = $style_id";
+			$result = $db->sql_query($sql, 3600);
+			$this->style = $db->sql_fetchrow($result);
+			$db->sql_freeresult($result);
+		}
+
 		// User has wrong style
 		if (!$this->style && $style_id == $this->data['user_style'])
 		{
@@ -618,18 +639,20 @@ class user extends \phpbb\session
 				else if ($this->lang_name == basename($config['default_lang']))
 				{
 					// Fall back to the English Language
+					$reset_lang_name = $this->lang_name;
 					$this->lang_name = 'en';
 					$this->set_lang($lang, $help, $lang_file, $use_db, $use_help, $ext_name);
+					$this->lang_name = $reset_lang_name;
 				}
 				else if ($this->lang_name == $this->data['user_lang'])
 				{
 					// Fall back to the board default language
+					$reset_lang_name = $this->lang_name;
 					$this->lang_name = basename($config['default_lang']);
 					$this->set_lang($lang, $help, $lang_file, $use_db, $use_help, $ext_name);
+					$this->lang_name = $reset_lang_name;
 				}
 
-				// Reset the lang name
-				$this->lang_name = (file_exists($lang_path . $this->data['user_lang'] . "/common.$phpEx")) ? $this->data['user_lang'] : basename($config['default_lang']);
 				return;
 			}