diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-08-07 16:13:46 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-08-07 16:13:46 +0200 |
| commit | 05b290c6b2c128f2433c82abc9b1af450cbaf2e0 (patch) | |
| tree | a87b846a313ef2d6fd29686d6850d131dc41666e /phpBB/phpbb/cache | |
| parent | 6e3c1eb72a77ee6addc16f47815f91ba332342ba (diff) | |
| parent | 0194c261c3373fbe3b9d8973807e0fdc0dd6474e (diff) | |
| download | forums-05b290c6b2c128f2433c82abc9b1af450cbaf2e0.tar forums-05b290c6b2c128f2433c82abc9b1af450cbaf2e0.tar.gz forums-05b290c6b2c128f2433c82abc9b1af450cbaf2e0.tar.bz2 forums-05b290c6b2c128f2433c82abc9b1af450cbaf2e0.tar.xz forums-05b290c6b2c128f2433c82abc9b1af450cbaf2e0.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[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); |