diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-12-24 00:57:36 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-12-24 00:57:36 -0500 |
| commit | 48463cba2ed3f3561bc0f66018b1b4e7f7bb8489 (patch) | |
| tree | 5f38aacf965f727e7899f93e6503b27b5e6d8611 /phpBB | |
| parent | 31ddac60916a3eb0697ab79e942d6200ebe54aed (diff) | |
| parent | 519db8e3b267c3f7135ba6bf30a25a4cc3e0a987 (diff) | |
| download | forums-48463cba2ed3f3561bc0f66018b1b4e7f7bb8489.tar forums-48463cba2ed3f3561bc0f66018b1b4e7f7bb8489.tar.gz forums-48463cba2ed3f3561bc0f66018b1b4e7f7bb8489.tar.bz2 forums-48463cba2ed3f3561bc0f66018b1b4e7f7bb8489.tar.xz forums-48463cba2ed3f3561bc0f66018b1b4e7f7bb8489.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10507] DBAL unit test
[ticket/10507] Sort styles in acp
Conflicts:
phpBB/includes/acp/acp_styles.php
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/acp/acp_styles.php | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php index b31d7763aa..8bd2545743 100644 --- a/phpBB/includes/acp/acp_styles.php +++ b/phpBB/includes/acp/acp_styles.php @@ -258,6 +258,7 @@ version = {VERSION} global $user, $template, $db, $config, $phpbb_root_path, $phpEx; $sql_from = ''; + $sql_sort = 'LOWER(' . $mode . '_name)'; $style_count = array(); switch ($mode) @@ -285,6 +286,9 @@ version = {VERSION} case 'theme': $sql_from = STYLES_THEME_TABLE; break; + + default: + trigger_error($user->lang['NO_MODE'] . adm_back_link($this->u_action), E_USER_WARNING); } $l_prefix = strtoupper($mode); @@ -308,7 +312,8 @@ version = {VERSION} ); $sql = "SELECT * - FROM $sql_from"; + FROM $sql_from + ORDER BY $sql_sort ASC"; $result = $db->sql_query($sql); $installed = array(); |