diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-11-20 13:18:27 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-11-20 13:18:27 +0100 |
| commit | d98fd7868ba75773fe89617f324f8516f63dfa16 (patch) | |
| tree | 7e7f70e0d27c80b3140f071ec71a92f244d56038 /phpBB/includes/functions_user.php | |
| parent | 6d58c4a4b5d9361a3bec8359b0bce9e9dd4eddf3 (diff) | |
| parent | ba5243ba7652049aa2c311a96bfdc94994ddaf4b (diff) | |
| download | forums-d98fd7868ba75773fe89617f324f8516f63dfa16.tar forums-d98fd7868ba75773fe89617f324f8516f63dfa16.tar.gz forums-d98fd7868ba75773fe89617f324f8516f63dfa16.tar.bz2 forums-d98fd7868ba75773fe89617f324f8516f63dfa16.tar.xz forums-d98fd7868ba75773fe89617f324f8516f63dfa16.zip | |
Merge pull request #4511 from senky/ticket/14842
[ticket/14842] Don't display filesize limit if there is none
Diffstat (limited to 'phpBB/includes/functions_user.php')
| -rw-r--r-- | phpBB/includes/functions_user.php | 2 |
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)); |