makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/12703] Only query database for subscription types once

Browse source 
PHPBB3-12703
This commit is contained in:
Marc Alexander 2014-10-26 13:56:34 -07:00
parent 222bec0204
commit cb65cd363a
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 */
protected $notification_types;
/** @var array */
protected $subscription_types;
/** @var array */
protected $notification_methods;
@ -524,7 +527,9 @@ class manager
*/
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)
{
@ -538,19 +543,20 @@ class manager
'group' => 'NOTIFICATION_GROUP_MISCELLANEOUS',
), (($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
if (isset($subscription_types['NOTIFICATION_GROUP_MISCELLANEOUS']))
if (isset($this->subscription_types['NOTIFICATION_GROUP_MISCELLANEOUS']))
{
$miscellaneous = $subscription_types['NOTIFICATION_GROUP_MISCELLANEOUS'];
unset($subscription_types['NOTIFICATION_GROUP_MISCELLANEOUS']);
$subscription_types['NOTIFICATION_GROUP_MISCELLANEOUS'] = $miscellaneous;
$miscellaneous = $this->subscription_types['NOTIFICATION_GROUP_MISCELLANEOUS'];
unset($this->subscription_types['NOTIFICATION_GROUP_MISCELLANEOUS']);
$this->subscription_types['NOTIFICATION_GROUP_MISCELLANEOUS'] = $miscellaneous;
}
}
return $subscription_types;
return $this->subscription_types;
}
/**