1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-05 15:16:16 +02:00

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.
This commit is contained in:
Nils Adermann 2012-05-31 15:43:09 +02:00
commit 7eaedcc8de

View File

@ -667,7 +667,9 @@ inherit_from = {INHERIT_FROM}
if ($name && !in_array($name, $installed)) 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, 'path' => $file,
'name' => $name, 'name' => $name,
'copyright' => $items['copyright'], 'copyright' => $items['copyright'],
@ -683,6 +685,8 @@ inherit_from = {INHERIT_FROM}
if (sizeof($new_ary)) if (sizeof($new_ary))
{ {
ksort($new_ary);
foreach ($new_ary as $cfg) foreach ($new_ary as $cfg)
{ {
$template->assign_block_vars('uninstalled', array( $template->assign_block_vars('uninstalled', array(