diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 26f7a74021..9a94b71ed0 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -148,6 +148,7 @@
 		<li>[Fix] If pruning users based on last activity, do not include users never logged in before (Bug #18105)</li>
 		<li>[Sec] Only allow searching by email address in memberlist for users having the a_user permission (reported by evil&lt;3)</li>
 		<li>[Sec] Limit private message attachments to be viewable only by the recipient(s)/sender (Report #s23535) - reported by AlleyKat</li>
+		<li>[Sec] Check for non-empty config.php within style.php (Report #s24575) - reported by bantu</li>
 	</ul>
 
 	<a name="v30rc8"></a><h3>1.i. Changes since 3.0.RC8</h3>
diff --git a/phpBB/style.php b/phpBB/style.php
index 469e2b7727..9d38128356 100644
--- a/phpBB/style.php
+++ b/phpBB/style.php
@@ -20,6 +20,11 @@ error_reporting(E_ALL ^ E_NOTICE);
 
 require($phpbb_root_path . 'config.' . $phpEx);
 
+if (!defined('PHPBB_INSTALLED') || empty($dbms) || !isset($dbhost) || !isset($dbpasswd) || empty($dbuser))
+{
+	exit;
+}
+
 if (version_compare(PHP_VERSION, '6.0.0-dev', '<'))
 {
 	set_magic_quotes_runtime(0);