diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-08-07 16:13:35 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-08-07 16:13:35 +0200 |
| commit | 0194c261c3373fbe3b9d8973807e0fdc0dd6474e (patch) | |
| tree | 7381207e0a5892f3def437db9b463a6caa1e0bb6 /phpBB/phpbb/cache | |
| parent | 6bb71e2ca9f71348516287a301c830adb0a1addf (diff) | |
| parent | d8d09e0df2729df000ac8384c48262f8b2d333ac (diff) | |
| download | forums-0194c261c3373fbe3b9d8973807e0fdc0dd6474e.tar forums-0194c261c3373fbe3b9d8973807e0fdc0dd6474e.tar.gz forums-0194c261c3373fbe3b9d8973807e0fdc0dd6474e.tar.bz2 forums-0194c261c3373fbe3b9d8973807e0fdc0dd6474e.tar.xz forums-0194c261c3373fbe3b9d8973807e0fdc0dd6474e.zip | |
Merge pull request #2720 from PayBas/ticket/12838
[ticket/12838] Add ACP events to acp_ranks
* PayBas/ticket/12838:
[ticket/12838] Simplify normal special rank array creation
[ticket/12838] Update RC2 to RC3
[ticket/12838] Update events.md to RC3
[ticket/12838] Allow for extra columns in cache obtain_ranks()
[ticket/12838] Add raw row-data to acp_ranks core event
[ticket/12838] Simplify special rank template conditional
[ticket/12838] Add core events to acp_ranks.php
[ticket/12838] Update events.md
[ticket/12838] Add _before versions
[ticket/12838] Add template events to acp_ranks.html
Diffstat (limited to 'phpBB/phpbb/cache')
| -rw-r--r-- | phpBB/phpbb/cache/service.php | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/phpBB/phpbb/cache/service.php b/phpBB/phpbb/cache/service.php index b890d90558..56727c2ad5 100644 --- a/phpBB/phpbb/cache/service.php +++ b/phpBB/phpbb/cache/service.php @@ -168,18 +168,12 @@ class service { if ($row['rank_special']) { - $ranks['special'][$row['rank_id']] = array( - 'rank_title' => $row['rank_title'], - 'rank_image' => $row['rank_image'] - ); + unset($row['rank_min']); + $ranks['special'][$row['rank_id']] = $row; } else { - $ranks['normal'][] = array( - 'rank_title' => $row['rank_title'], - 'rank_min' => $row['rank_min'], - 'rank_image' => $row['rank_image'] - ); + $ranks['normal'][$row['rank_id']] = $row; } } $this->db->sql_freeresult($result); |