aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_posting.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-08-28 15:50:33 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-08-28 15:50:33 +0000
commit1d37b69ddd79d9d6bc1346f3761a899d20305636 (patch)
tree7b795bcfea4d119c86b59a7471be36504b4f9c1b /phpBB/includes/functions_posting.php
parent902285684d08394437650174fa9bdfe6904db85c (diff)
downloadforums-1d37b69ddd79d9d6bc1346f3761a899d20305636.tar
forums-1d37b69ddd79d9d6bc1346f3761a899d20305636.tar.gz
forums-1d37b69ddd79d9d6bc1346f3761a899d20305636.tar.bz2
forums-1d37b69ddd79d9d6bc1346f3761a899d20305636.tar.xz
forums-1d37b69ddd79d9d6bc1346f3761a899d20305636.zip
- some bugfixes
- using E_USER_WARNING if an error occurred within the ACP (sadly not able to use it as a default for trigger_error - it seems to be hardcoded in PHP) git-svn-id: file:///svn/phpbb/trunk@6320 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_posting.php')
-rw-r--r--phpBB/includes/functions_posting.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index e54c27ed53..2ac732746e 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -423,8 +423,10 @@ function upload_attachment($form_name, $forum_id, $local = false, $local_storage
*/
function get_img_size_format($width, $height)
{
+ global $config;
+
// Maximum Width the Image can take
- $max_width = 400;
+ $max_width = ($config['img_max_thumb_width']) ? $config['img_max_thumb_width'] : 400;
if ($width > $height)
{