From 19e2dcd5db7f2a910409b82ce315265608ae8266 Mon Sep 17 00:00:00 2001
From: Gabriel Vazquez <leviatan21@phpbb.com>
Date: Wed, 24 Jun 2009 02:56:05 +0000
Subject: Fixed Bug #47145 - [Fix] Correctly check banned users when force
 password change

Authorised by: AcydBurn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9665 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/style.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/style.php')

diff --git a/phpBB/style.php b/phpBB/style.php
index 78fd2a91b4..a5c50e7fec 100644
--- a/phpBB/style.php
+++ b/phpBB/style.php
@@ -91,7 +91,7 @@ if ($id)
 	$recompile = $config['load_tplcompile'];
 	if (!$user)
 	{
-		$id			= $config['default_style'];
+		$id			= ($id) ? $id : $config['default_style'];
 		$recompile	= false;
 		$user		= array('user_id' => ANONYMOUS);
 	}
@@ -289,4 +289,4 @@ if ($id)
 
 exit;
 
-?>
\ No newline at end of file
+?>
-- 
cgit v1.2.1


From e8638ff0ef36c3305e8f9136552439c858fae4b5 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Wed, 24 Jun 2009 09:24:09 +0000
Subject: tiny tiny thing... and such a huge change...

Display topic icons in MCP forum view again (only prosilver)

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9667 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/style.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/style.php')

diff --git a/phpBB/style.php b/phpBB/style.php
index a5c50e7fec..40d34c598c 100644
--- a/phpBB/style.php
+++ b/phpBB/style.php
@@ -289,4 +289,4 @@ if ($id)
 
 exit;
 
-?>
+?>
\ No newline at end of file
-- 
cgit v1.2.1


From c9ecb5dee73cacf7a805189db3f34cdc14703f45 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Tue, 25 Aug 2009 12:19:57 +0000
Subject: Fix style recompilation now we do not force the SID to be passed
 anymore. This also fixes the problems users see after updates, where styles
 are not always instantly updated, as well as helping style authors a lot. ;)

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10056 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/style.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB/style.php')

diff --git a/phpBB/style.php b/phpBB/style.php
index 40d34c598c..0b4c3d0d41 100644
--- a/phpBB/style.php
+++ b/phpBB/style.php
@@ -92,7 +92,8 @@ if ($id)
 	if (!$user)
 	{
 		$id			= ($id) ? $id : $config['default_style'];
-		$recompile	= false;
+//		Commented out because calls do not always include the SID anymore
+//		$recompile	= false;
 		$user		= array('user_id' => ANONYMOUS);
 	}
 
-- 
cgit v1.2.1