aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2008-04-21 10:54:41 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2008-04-21 10:54:41 +0000
commit71d725ae9116972c1135771f04f3fb73251d9bfa (patch)
treef16867f53cefe19ec593cdb150dac83dd6b5d7d6 /phpBB
parent5ca1f737035c492ded45dda81e880d2767a9b502 (diff)
downloadforums-71d725ae9116972c1135771f04f3fb73251d9bfa.tar
forums-71d725ae9116972c1135771f04f3fb73251d9bfa.tar.gz
forums-71d725ae9116972c1135771f04f3fb73251d9bfa.tar.bz2
forums-71d725ae9116972c1135771f04f3fb73251d9bfa.tar.xz
forums-71d725ae9116972c1135771f04f3fb73251d9bfa.zip
add PHPBB_INSTALLED check to file.php too
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8514 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/docs/CHANGELOG.html1
-rw-r--r--phpBB/download/file.php6
2 files changed, 7 insertions, 0 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 05725557d3..3c03801b23 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -95,6 +95,7 @@
<li>[Fix] Bring the PostgreSQL backup system back to working order (Bug #22385)</li>
<li>[Change] Sort the tables at the database table backup screen</li>
<li>[Fix] Update correct theme for cached styles in style.php (Bug #25805)</li>
+ <li>[Fix] Also add PHPBB_INSTALLED check to download/file.php for inline avatar delivery</li>
</ul>
<a name="v300"></a><h3>1.ii. Changes since 3.0.0</h3>
diff --git a/phpBB/download/file.php b/phpBB/download/file.php
index 9940bf9aa5..1d325a500e 100644
--- a/phpBB/download/file.php
+++ b/phpBB/download/file.php
@@ -18,6 +18,12 @@ $phpEx = substr(strrchr(__FILE__, '.'), 1);
if (isset($_GET['avatar']))
{
require($phpbb_root_path . 'config.' . $phpEx);
+
+ if (!defined('PHPBB_INSTALLED') || empty($dbms) || empty($acm_type))
+ {
+ exit;
+ }
+
require($phpbb_root_path . 'includes/acm/acm_' . $acm_type . '.' . $phpEx);
require($phpbb_root_path . 'includes/cache.' . $phpEx);
require($phpbb_root_path . 'includes/db/' . $dbms . '.' . $phpEx);