Merge branch '3.1.x'

Conflicts: phpBB/includes/functions_messenger.php
2025-07-31 05:50:42 +02:00 · 2015-09-07 12:16:12 +02:00
parent c2a5108452 9537ec56eb
commit 3ddee852fa
1 changed files with 2 additions and 0 deletions
--- a/phpBB/includes/functions_messenger.php
+++ b/phpBB/includes/functions_messenger.php
@@ -931,6 +931,8 @@ class queue
 			{
 				// Do nothing
 			}
+
+			$this->data = array();
 		}

 		$lock->release();