mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-29 13:00:26 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.1.x' into 3.2.x

Browse Source 
Conflicts:
	phpBB/phpbb/notification/manager.php
This commit is contained in:
Marc Alexander
2016-05-27 22:13:35 +02:00
parent 9bea18b5db e30518461c
commit 80db259ab9
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -943,11 +943,16 @@ class manager
/** /**
* Get notification type ids (as an array) * Get notification type ids (as an array)
* *
* @param array $notification_type_names Array of strings * @param string|array $notification_type_names Notification type names
* @return array Array of integers * @return array Array of integers
*/ */
public function get_notification_type_ids(array $notification_type_names) public function get_notification_type_ids($notification_type_names)
{ {
if (!is_array($notification_type_names))
{
$notification_type_names = array($notification_type_names);
}
$notification_type_ids = array(); $notification_type_ids = array();
foreach ($notification_type_names as $name) foreach ($notification_type_names as $name)