aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2003-04-15 18:56:31 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2003-04-15 18:56:31 +0000
commit42b50a5d0ff5addd51da09bd169c0474ee3949a7 (patch)
tree362388dab90631013cdfcf60334e2dca90ddc1fe /phpBB/includes/functions.php
parent93cb1853b5978cb7d46ccda0567cae6b119d3761 (diff)
downloadforums-42b50a5d0ff5addd51da09bd169c0474ee3949a7.tar
forums-42b50a5d0ff5addd51da09bd169c0474ee3949a7.tar.gz
forums-42b50a5d0ff5addd51da09bd169c0474ee3949a7.tar.bz2
forums-42b50a5d0ff5addd51da09bd169c0474ee3949a7.tar.xz
forums-42b50a5d0ff5addd51da09bd169c0474ee3949a7.zip
fixed delete post bug, use extension cache while posting, fix download counter for images
git-svn-id: file:///svn/phpbb/trunk@3838 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions.php')
-rw-r--r--phpBB/includes/functions.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index cbce502231..6e1843315b 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -785,7 +785,7 @@ function obtain_attach_extensions(&$extensions)
else
{
// Don't count on forbidden extensions table, because it is not allowed to allow forbidden extensions at all
- $sql = "SELECT e.extension, g.cat_id, g.download_mode, g.upload_icon
+ $sql = "SELECT e.extension, g.*
FROM " . EXTENSIONS_TABLE . " e, " . EXTENSION_GROUPS_TABLE . " g
WHERE e.group_id = g.group_id
AND g.allow_group = 1";
@@ -800,6 +800,7 @@ function obtain_attach_extensions(&$extensions)
$extensions[$extension]['display_cat'] = intval($row['cat_id']);
$extensions[$extension]['download_mode'] = intval($row['download_mode']);
$extensions[$extension]['upload_icon'] = trim($row['upload_icon']);
+ $extensions[$extension]['max_filesize'] = intval($row['max_filesize']);
}
$db->sql_freeresult($result);