diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-12-24 00:57:07 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-12-24 00:57:07 -0500 |
| commit | 519db8e3b267c3f7135ba6bf30a25a4cc3e0a987 (patch) | |
| tree | 6b20edc2717eae346b6a865ea9331820d903ab2e /phpBB/includes | |
| parent | 02f7baa0a5bd6b66435e1471d6e372fad9202569 (diff) | |
| parent | 80149d0c872292cf7cf7be8aa1eca5641f7cd708 (diff) | |
| download | forums-519db8e3b267c3f7135ba6bf30a25a4cc3e0a987.tar forums-519db8e3b267c3f7135ba6bf30a25a4cc3e0a987.tar.gz forums-519db8e3b267c3f7135ba6bf30a25a4cc3e0a987.tar.bz2 forums-519db8e3b267c3f7135ba6bf30a25a4cc3e0a987.tar.xz forums-519db8e3b267c3f7135ba6bf30a25a4cc3e0a987.zip | |
Merge remote-tracking branch 'cyberalien/ticket/10507' into develop-olympus
* cyberalien/ticket/10507:
[ticket/10507] DBAL unit test
[ticket/10507] Sort styles in acp
Diffstat (limited to 'phpBB/includes')
| -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 5300265686..e25061d6f0 100644 --- a/phpBB/includes/acp/acp_styles.php +++ b/phpBB/includes/acp/acp_styles.php @@ -540,6 +540,7 @@ parse_css_file = {PARSE_CSS_FILE} global $user, $template, $db, $config, $phpbb_root_path, $phpEx; $sql_from = ''; + $sql_sort = 'LOWER(' . $mode . '_name)'; $style_count = array(); switch ($mode) @@ -571,6 +572,9 @@ parse_css_file = {PARSE_CSS_FILE} case 'imageset': $sql_from = STYLES_IMAGESET_TABLE; break; + + default: + trigger_error($user->lang['NO_MODE'] . adm_back_link($this->u_action), E_USER_WARNING); } $l_prefix = strtoupper($mode); @@ -594,7 +598,8 @@ parse_css_file = {PARSE_CSS_FILE} ); $sql = "SELECT * - FROM $sql_from"; + FROM $sql_from + ORDER BY $sql_sort ASC"; $result = $db->sql_query($sql); $installed = array(); |