From df0ac9876c794be0bfc49bfdcfd50366afa88d49 Mon Sep 17 00:00:00 2001
From: Oliver Schramm <oliver.schramm97@gmail.com>
Date: Sat, 15 Mar 2014 22:00:48 +0100
Subject: [ticket/11071] Add fallback if requested style don't exist

PHPBB3-11071
---
 phpBB/phpbb/user.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'phpBB/phpbb/user.php')

diff --git a/phpBB/phpbb/user.php b/phpBB/phpbb/user.php
index 2a7cc602da..6c060e21ea 100644
--- a/phpBB/phpbb/user.php
+++ b/phpBB/phpbb/user.php
@@ -204,6 +204,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'])
 		{
-- 
cgit v1.2.1