From: Niklas Laxström <niklas.laxstrom@gmail.com>
Date: Fri, 5 Oct 2012 07:29:36 +0000 (+0000)
Subject: else { if } makes no sense
X-Git-Tag: 1.31.0-rc.0~22147
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dcompta/comptes/journal.php?a=commitdiff_plain;h=18078131c59941e2ac1163f782956050e91be167;p=lhc%2Fweb%2Fwiklou.git

else { if } makes no sense

I complained about this in gerrit but looks like my
comment was not saved

Change-Id: Ie570bdaf89e93628de730102587064ee0495fb1b
---

diff --git a/includes/db/Database.php b/includes/db/Database.php
index c082cc9811..0a51f490ae 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -2925,11 +2925,9 @@ abstract class DatabaseBase implements DatabaseType {
 				//    started and comitted.
 				wfWarn( "$fname: Transaction already in progress (from {$this->mTrxFname}), " .
 					" performing implicit commit!" );
-			} else {
-				if ( $wgDebugDBTransactions ) {
-					wfDebug( "$fname: Transaction already in progress (from {$this->mTrxFname}), " .
-						" performing implicit commit!\n" );
-				}
+			} elseif ( $wgDebugDBTransactions ) {
+				wfDebug( "$fname: Transaction already in progress (from {$this->mTrxFname}), " .
+					" performing implicit commit!\n" );
 			}
 
 			$this->doCommit( $fname );