Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ticket/14842] Don't display filesize limit if there is none #4511

Merged
merged 1 commit into from
Nov 20, 2016

Conversation

senky
Copy link
Contributor

@senky senky commented Nov 13, 2016

Checklist:

  • Correct branch: master for new features; 3.2.x, 3.1.x for fixes
  • Tests pass
  • Code follows coding guidelines: master / 3.2.x, 3.1.x
  • Commit follows commit message format

Tracker ticket (set the ticket ID to your ticket ID):

https://tracker.phpbb.com/browse/PHPBB3-14842

PHPBB3-14842

$user->lang('PIXELS', (int) $config['avatar_max_width']),
$user->lang('PIXELS', (int) $config['avatar_max_height']),
round($config['avatar_filesize'] / 1024));
round($config['avatar_filesize'] / 1024);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like this was removed by accident?

@@ -1924,7 +1924,7 @@ function main($id, $mode)

'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' => sprintf($user->lang[($config['avatar_filesize'] == 0) ? 'AVATAR_EXPLAIN_NO_FILESIZE' : 'AVATAR_EXPLAIN'], $config['avatar_max_width'], $config['avatar_max_height'], $config['avatar_filesize'] / 1024),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

while you are at it, please replace the usage of sprintf + the lang array by the lang method.
And split it into 2 lines.

@marc1706 marc1706 added this to the 3.1.11 milestone Nov 20, 2016
marc1706 added a commit to marc1706/phpbb that referenced this pull request Nov 20, 2016
[ticket/14842] Don't display filesize limit if there is none
@marc1706 marc1706 merged commit ba5243b into phpbb:3.1.x Nov 20, 2016
@senky senky deleted the ticket/14842 branch November 20, 2016 15:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants