aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2012-11-21 19:51:46 +0100
committerMarc Alexander <admin@m-a-styles.de>2012-11-21 20:01:50 +0100
commit24ac0393360aed07a17b7acaca0add6083cf8ddd (patch)
treee34e47e25bd8ec33665e0762a42c4723ab97513d
parent01b313ea262dc7c7a3399c03758ffd1ba24d1ff4 (diff)
downloadforums-24ac0393360aed07a17b7acaca0add6083cf8ddd.tar
forums-24ac0393360aed07a17b7acaca0add6083cf8ddd.tar.gz
forums-24ac0393360aed07a17b7acaca0add6083cf8ddd.tar.bz2
forums-24ac0393360aed07a17b7acaca0add6083cf8ddd.tar.xz
forums-24ac0393360aed07a17b7acaca0add6083cf8ddd.zip
[feature/avatars] Get rid of array_keys() in gallery avatar
PHPBB3-10018
-rw-r--r--phpBB/includes/avatar/driver/local.php9
1 files changed, 6 insertions, 3 deletions
diff --git a/phpBB/includes/avatar/driver/local.php b/phpBB/includes/avatar/driver/local.php
index f3c0d516af..a206f5b1b0 100644
--- a/phpBB/includes/avatar/driver/local.php
+++ b/phpBB/includes/avatar/driver/local.php
@@ -52,9 +52,7 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
$avatar_list = $this->get_avatar_list();
$category = $this->request->variable('av_local_cat', '');
- $categories = array_keys($avatar_list);
-
- foreach ($categories as $cat)
+ foreach ($avatar_list as $cat => $null)
{
if (!empty($avatar_list[$cat]))
{
@@ -63,6 +61,11 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
'SELECTED' => ($cat == $category),
));
}
+
+ if ($cat != $category)
+ {
+ unset($avatar_list[$cat]);
+ }
}
if (!empty($avatar_list[$category]))