diff options
| author | Nils Adermann <naderman@naderman.de> | 2012-05-31 15:43:09 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2012-05-31 15:43:09 +0200 |
| commit | 7eaedcc8de0b744aa3c821581f73e0202651b0b1 (patch) | |
| tree | 1b2b005fe11681c352bfbd13f8e32c77aa8272a1 /phpBB/includes | |
| parent | b10757ef144d501af578edd4e438a088ee07ccf0 (diff) | |
| parent | 701bf571dfffa171271d567759cf92c3830d159c (diff) | |
| download | forums-7eaedcc8de0b744aa3c821581f73e0202651b0b1.tar forums-7eaedcc8de0b744aa3c821581f73e0202651b0b1.tar.gz forums-7eaedcc8de0b744aa3c821581f73e0202651b0b1.tar.bz2 forums-7eaedcc8de0b744aa3c821581f73e0202651b0b1.tar.xz forums-7eaedcc8de0b744aa3c821581f73e0202651b0b1.zip | |
Merge remote-tracking branch 'github-bantu/ticket/10550' into develop-olympus
By Andreas Fischer
via Andreas Fischer
* github-bantu/ticket/10550:
[ticket/10550] Sort not installed styles list in the styles section of the ACP.
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_styles.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php index d7b0484af8..47cd02bca7 100644 --- a/phpBB/includes/acp/acp_styles.php +++ b/phpBB/includes/acp/acp_styles.php @@ -667,7 +667,9 @@ inherit_from = {INHERIT_FROM} if ($name && !in_array($name, $installed)) { - $new_ary[] = array( + // The array key is used for sorting later on. + // $file is appended because $name doesn't have to be unique. + $new_ary[$name . $file] = array( 'path' => $file, 'name' => $name, 'copyright' => $items['copyright'], @@ -683,6 +685,8 @@ inherit_from = {INHERIT_FROM} if (sizeof($new_ary)) { + ksort($new_ary); + foreach ($new_ary as $cfg) { $template->assign_block_vars('uninstalled', array( |