aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions.php
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2015-06-13 16:27:44 +0200
committerAndreas Fischer <bantu@phpbb.com>2015-06-13 16:27:44 +0200
commit2eceaaddf68d0d1f1dca741d49386e889cf1cc4e (patch)
treef88d52675118ee1084d82fda4737c52a4aa35ba0 /phpBB/includes/functions.php
parente0d1f811145a0b49809147ae61b041672ac7cd06 (diff)
parent89f7fc63e8713aa6c332dce5e77df6112af8d635 (diff)
downloadforums-2eceaaddf68d0d1f1dca741d49386e889cf1cc4e.tar
forums-2eceaaddf68d0d1f1dca741d49386e889cf1cc4e.tar.gz
forums-2eceaaddf68d0d1f1dca741d49386e889cf1cc4e.tar.bz2
forums-2eceaaddf68d0d1f1dca741d49386e889cf1cc4e.tar.xz
forums-2eceaaddf68d0d1f1dca741d49386e889cf1cc4e.zip
Merge branch '3.1.x'
* 3.1.x: [ticket/10711] Duplicate key error on forum_tracks_table
Diffstat (limited to 'phpBB/includes/functions.php')
-rw-r--r--phpBB/includes/functions.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index b722c30416..aeabe751aa 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -686,6 +686,10 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $
{
$forum_id = array($forum_id);
}
+ else
+ {
+ $forum_id = array_unique($forum_id);
+ }
/* @var $phpbb_notifications \phpbb\notification\manager */
$phpbb_notifications = $phpbb_container->get('notification_manager');