aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_users.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2016-11-20 13:18:27 +0100
committerMarc Alexander <admin@m-a-styles.de>2016-11-20 13:18:27 +0100
commitd98fd7868ba75773fe89617f324f8516f63dfa16 (patch)
tree7e7f70e0d27c80b3140f071ec71a92f244d56038 /phpBB/includes/acp/acp_users.php
parent6d58c4a4b5d9361a3bec8359b0bce9e9dd4eddf3 (diff)
parentba5243ba7652049aa2c311a96bfdc94994ddaf4b (diff)
downloadforums-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/acp/acp_users.php')
-rw-r--r--phpBB/includes/acp/acp_users.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 008cc02471..cd44800af8 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -1929,7 +1929,7 @@ class acp_users
'S_FORM_ENCTYPE' => ' enctype="multipart/form-data"',
- 'L_AVATAR_EXPLAIN' => sprintf($user->lang['AVATAR_EXPLAIN'], $config['avatar_max_width'], $config['avatar_max_height'], $config['avatar_filesize'] / 1024),
+ 'L_AVATAR_EXPLAIN' => $user->lang(($config['avatar_filesize'] == 0) ? 'AVATAR_EXPLAIN_NO_FILESIZE' : 'AVATAR_EXPLAIN', $config['avatar_max_width'], $config['avatar_max_height'], $config['avatar_filesize'] / 1024),
'S_AVATARS_ENABLED' => ($config['allow_avatar'] && $avatars_enabled),
));