From: Aaron Schulz <aschulz@wikimedia.org>
Date: Thu, 6 Aug 2015 19:45:30 +0000 (-0700)
Subject: Fixed deadlockLoop() IDE errors
X-Git-Tag: 1.31.0-rc.0~10491^2
X-Git-Url: http://git.cyclocoop.org/%24self?a=commitdiff_plain;h=e7a7fb42388edb24fa206975c9a7aaf22991e54c;p=lhc%2Fweb%2Fwiklou.git

Fixed deadlockLoop() IDE errors

Change-Id: I76bb9250bc8017756af4f2552cd48ab595a26297
---

diff --git a/includes/db/Database.php b/includes/db/Database.php
index 2ee45451d3..cf0eab794c 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -3205,7 +3205,8 @@ abstract class DatabaseBase implements IDatabase {
 	 * iteration, or false on error, for example if the retry limit was
 	 * reached.
 	 *
-	 * @return bool
+	 * @return mixed
+	 * @throws DBQueryError
 	 */
 	public function deadlockLoop() {
 		$args = func_get_args();
@@ -3219,6 +3220,7 @@ abstract class DatabaseBase implements IDatabase {
 
 		$this->begin( __METHOD__ );
 
+		$retVal = null;
 		$e = null;
 		do {
 			try {