mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00
Code Issues Releases Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse Source 
* develop-ascraeus:
  [ticket/12703] Only query database for subscription types once
This commit is contained in:
Andreas Fischer 2014-10-29 15:09:55 +01:00
commit ae55db6da4
1 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
phpBB/phpbb/notification/manager.php
View File

@ -23,6 +23,9 @@ class manager
/** @var array */ /** @var array */
protected $notification_types; protected $notification_types;
/** @var array */
protected $subscription_types;
/** @var array */ /** @var array */
protected $notification_methods; protected $notification_methods;
@ -524,7 +527,9 @@ class manager
*/ */
public function get_subscription_types() public function get_subscription_types()
{ {
$subscription_types = array(); if ($this->subscription_types === null)
{
$this->subscription_types = array();
foreach ($this->notification_types as $type_name => $data) foreach ($this->notification_types as $type_name => $data)
{ {
@ -538,19 +543,20 @@ class manager
'group' => 'NOTIFICATION_GROUP_MISCELLANEOUS', 'group' => 'NOTIFICATION_GROUP_MISCELLANEOUS',
), (($type::$notification_option !== false) ? $type::$notification_option : array())); ), (($type::$notification_option !== false) ? $type::$notification_option : array()));
$subscription_types[$options['group']][$options['id']] = $options; $this->subscription_types[$options['group']][$options['id']] = $options;
} }
} }
// Move Miscellaneous to the very last section // Move Miscellaneous to the very last section
if (isset($subscription_types['NOTIFICATION_GROUP_MISCELLANEOUS'])) if (isset($this->subscription_types['NOTIFICATION_GROUP_MISCELLANEOUS']))
{ {
$miscellaneous = $subscription_types['NOTIFICATION_GROUP_MISCELLANEOUS']; $miscellaneous = $this->subscription_types['NOTIFICATION_GROUP_MISCELLANEOUS'];
unset($subscription_types['NOTIFICATION_GROUP_MISCELLANEOUS']); unset($this->subscription_types['NOTIFICATION_GROUP_MISCELLANEOUS']);
$subscription_types['NOTIFICATION_GROUP_MISCELLANEOUS'] = $miscellaneous; $this->subscription_types['NOTIFICATION_GROUP_MISCELLANEOUS'] = $miscellaneous;
}
} }
return $subscription_types; return $this->subscription_types;
} }
/** /**