diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-10-06 13:23:41 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-10-06 13:23:41 +0000 |
| commit | dc4197d651c968f8749bf63d29539701eee07c48 (patch) | |
| tree | 073abe262a4c1b69ae35b75b697a270c19e4d694 /phpBB/includes | |
| parent | dc8e30e7341f1ef31a3fd73f8b143b73bc7d6fa1 (diff) | |
| download | forums-dc4197d651c968f8749bf63d29539701eee07c48.tar forums-dc4197d651c968f8749bf63d29539701eee07c48.tar.gz forums-dc4197d651c968f8749bf63d29539701eee07c48.tar.bz2 forums-dc4197d651c968f8749bf63d29539701eee07c48.tar.xz forums-dc4197d651c968f8749bf63d29539701eee07c48.zip | |
Sort topic icons/smilies by filename when adding new topics/smilies (Bug #13501)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8974 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_icons.php | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/phpBB/includes/acp/acp_icons.php b/phpBB/includes/acp/acp_icons.php index 00d99d2f9a..a88090cb25 100644 --- a/phpBB/includes/acp/acp_icons.php +++ b/phpBB/includes/acp/acp_icons.php @@ -73,6 +73,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); @@ -99,6 +106,11 @@ class acp_icons } } closedir($dir); + + if (!empty($_paks)) + { + asort($_paks, SORT_STRING); + } } } |