aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_user.php
diff options
context:
space:
mode:
authorJakub Senko <jakubsenko@gmail.com>2016-11-13 15:47:54 +0100
committerJakub Senko <jakubsenko@gmail.com>2016-11-15 14:22:42 +0100
commitba5243ba7652049aa2c311a96bfdc94994ddaf4b (patch)
treeb55d4336750e54dee61af63ed1e46090b1bdc3e2 /phpBB/includes/functions_user.php
parent85898d3d2c7b5ce61a0f92299e06ceade000c4a8 (diff)
downloadforums-ba5243ba7652049aa2c311a96bfdc94994ddaf4b.tar
forums-ba5243ba7652049aa2c311a96bfdc94994ddaf4b.tar.gz
forums-ba5243ba7652049aa2c311a96bfdc94994ddaf4b.tar.bz2
forums-ba5243ba7652049aa2c311a96bfdc94994ddaf4b.tar.xz
forums-ba5243ba7652049aa2c311a96bfdc94994ddaf4b.zip
[ticket/14842] Don't display filesize limit if there is none
PHPBB3-14842
Diffstat (limited to 'phpBB/includes/functions_user.php')
-rw-r--r--phpBB/includes/functions_user.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index b82abe0c5e..0b39339c7f 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -2279,7 +2279,7 @@ function phpbb_avatar_explanation_string()
{
global $config, $user;
- return $user->lang('AVATAR_EXPLAIN',
+ return $user->lang(($config['avatar_filesize'] == 0) ? 'AVATAR_EXPLAIN_NO_FILESIZE' : 'AVATAR_EXPLAIN',
$user->lang('PIXELS', (int) $config['avatar_max_width']),
$user->lang('PIXELS', (int) $config['avatar_max_height']),
round($config['avatar_filesize'] / 1024));