mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-olympus' into develop

Browse Source 
* develop-olympus:
  [ticket/10507] DBAL unit test
  [ticket/10507] Sort styles in acp

Conflicts:
	phpBB/includes/acp/acp_styles.php
This commit is contained in:
Oleg Pudeyev
2011-12-24 00:57:36 -05:00
parent 31ddac6091 519db8e3b2
commit 48463cba2e
3 changed files with 107 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
phpBB/includes/acp/acp_styles.php
View File

@@ -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();