diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-06-05 23:28:00 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-06-05 23:28:00 +0200 |
| commit | 4d24681259fdd8ca5d9c1ed754db203159c979df (patch) | |
| tree | ce71368bed1628930eb727e063821c2835804ef8 /phpBB/phpbb | |
| parent | 49c875413ca2fd1cc438ce42c64e0a00a5044e56 (diff) | |
| download | forums-4d24681259fdd8ca5d9c1ed754db203159c979df.tar forums-4d24681259fdd8ca5d9c1ed754db203159c979df.tar.gz forums-4d24681259fdd8ca5d9c1ed754db203159c979df.tar.bz2 forums-4d24681259fdd8ca5d9c1ed754db203159c979df.tar.xz forums-4d24681259fdd8ca5d9c1ed754db203159c979df.zip | |
[ticket/12666] Use "None" for images in root of gallery avatar path
"None" serves no real purpose right now. After this it will be used instead
of "Main" for images in the root of the gallery avatar path.
PHPBB3-12666
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], |