diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-06-06 16:03:08 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-06-06 16:03:08 +0200 |
| commit | 1f78ab536b280cabb782a0178c6260e3b3db2da3 (patch) | |
| tree | ce71368bed1628930eb727e063821c2835804ef8 /phpBB/phpbb | |
| parent | 49c875413ca2fd1cc438ce42c64e0a00a5044e56 (diff) | |
| parent | 4d24681259fdd8ca5d9c1ed754db203159c979df (diff) | |
| download | forums-1f78ab536b280cabb782a0178c6260e3b3db2da3.tar forums-1f78ab536b280cabb782a0178c6260e3b3db2da3.tar.gz forums-1f78ab536b280cabb782a0178c6260e3b3db2da3.tar.bz2 forums-1f78ab536b280cabb782a0178c6260e3b3db2da3.tar.xz forums-1f78ab536b280cabb782a0178c6260e3b3db2da3.zip | |
Merge pull request #2552 from marc1706/ticket/12666
[ticket/12666] Use "None" for images in root of gallery avatar path
* marc1706/ticket/12666:
[ticket/12666] Use "None" for images in root of gallery avatar path
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/avatar/driver/local.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/phpbb/avatar/driver/local.php b/phpBB/phpbb/avatar/driver/local.php index c9e6781205..f3acf7cb2c 100644 --- a/phpBB/phpbb/avatar/driver/local.php +++ b/phpBB/phpbb/avatar/driver/local.php @@ -131,7 +131,7 @@ class local extends \phpbb\avatar\driver\driver } return array( - 'avatar' => ($category != $user->lang['MAIN']) ? $category . '/' . $file : $file, + 'avatar' => ($category != $user->lang['NO_AVATAR_CATEGORY']) ? $category . '/' . $file : $file, 'avatar_width' => $avatar_list[$category][urldecode($file)]['width'], 'avatar_height' => $avatar_list[$category][urldecode($file)]['height'], ); @@ -179,9 +179,9 @@ class local extends \phpbb\avatar\driver\driver { $dims = array(0, 0); } - $cat = ($path == $file_path) ? $user->lang['MAIN'] : str_replace("$path/", '', $file_path); + $cat = ($path == $file_path) ? $user->lang['NO_AVATAR_CATEGORY'] : str_replace("$path/", '', $file_path); $avatar_list[$cat][$image] = array( - 'file' => ($cat != $user->lang['MAIN']) ? rawurlencode($cat) . '/' . rawurlencode($image) : rawurlencode($image), + 'file' => ($cat != $user->lang['NO_AVATAR_CATEGORY']) ? rawurlencode($cat) . '/' . rawurlencode($image) : rawurlencode($image), 'filename' => rawurlencode($image), 'name' => ucfirst(str_replace('_', ' ', preg_replace('#^(.*)\..*$#', '\1', $image))), 'width' => $dims[0], |