diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-01-06 02:45:35 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-01-06 02:45:35 -0500 |
| commit | 95a74c7472ffa56d5fdcbbc2ec883d9f24db1037 (patch) | |
| tree | 96c79f46985194bef28db7bce02be55ffe459a8d /phpBB/includes | |
| parent | 3e7a0a37461e95f2c97d90230745f7e273565eec (diff) | |
| parent | 23363efaaacd2bec39a51c27db51a2777e7a4c21 (diff) | |
| download | forums-95a74c7472ffa56d5fdcbbc2ec883d9f24db1037.tar forums-95a74c7472ffa56d5fdcbbc2ec883d9f24db1037.tar.gz forums-95a74c7472ffa56d5fdcbbc2ec883d9f24db1037.tar.bz2 forums-95a74c7472ffa56d5fdcbbc2ec883d9f24db1037.tar.xz forums-95a74c7472ffa56d5fdcbbc2ec883d9f24db1037.zip | |
Merge remote-tracking branch 'cyberalien/ticket/10563' into develop-olympus
* cyberalien/ticket/10563:
[ticket/10563] Show deactivated styles below active styles in acp
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_styles.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php index e25061d6f0..5a7902755e 100644 --- a/phpBB/includes/acp/acp_styles.php +++ b/phpBB/includes/acp/acp_styles.php @@ -547,6 +547,7 @@ parse_css_file = {PARSE_CSS_FILE} { case 'style': $sql_from = STYLES_TABLE; + $sql_sort = 'style_active DESC, ' . $sql_sort; $sql = 'SELECT user_style, COUNT(user_style) AS style_count FROM ' . USERS_TABLE . ' @@ -635,6 +636,8 @@ parse_css_file = {PARSE_CSS_FILE} 'NAME' => $row[$mode . '_name'], 'STYLE_COUNT' => ($mode == 'style' && isset($style_count[$row['style_id']])) ? $style_count[$row['style_id']] : 0, + + 'S_INACTIVE' => ($mode == 'style' && !$row['style_active']) ? true : false, ) ); } |