aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_icons.php
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/includes/acp/acp_icons.php')
-rw-r--r--phpBB/includes/acp/acp_icons.php12
1 files changed, 12 insertions, 0 deletions
diff --git a/phpBB/includes/acp/acp_icons.php b/phpBB/includes/acp/acp_icons.php
index e6ea124ae5..aa7429dc96 100644
--- a/phpBB/includes/acp/acp_icons.php
+++ b/phpBB/includes/acp/acp_icons.php
@@ -72,6 +72,13 @@ class acp_icons
foreach ($imglist as $path => $img_ary)
{
+ if (empty($img_ary))
+ {
+ continue;
+ }
+
+ asort($img_ary, SORT_STRING);
+
foreach ($img_ary as $img)
{
$img_size = getimagesize(PHPBB_ROOT_PATH . $img_path . '/' . $path . $img);
@@ -98,6 +105,11 @@ class acp_icons
}
}
closedir($dir);
+
+ if (!empty($_paks))
+ {
+ asort($_paks, SORT_STRING);
+ }
}
}