Merge "Remove deprecated 1.7 SpecialPage::addPage"

[lhc/web/wiklou.git] / includes / db / Database.php

diff --git a/includes/db/Database.php b/includes/db/Database.php
index c082cc9..5271208 100644 (file)
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -2923,13 +2923,11 @@ abstract class DatabaseBase implements DatabaseType {
                                //
                                // b) the DBO_TRX flag is not set. Explicit transactions should always be properly
                                //    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" );
-                               }
+                               /*wfWarn( "$fname: Transaction already in progress (from {$this->mTrxFname}), " .
+                                       " performing implicit commit!" );*/
+                       } elseif ( $wgDebugDBTransactions ) {
+                               wfDebug( "$fname: Transaction already in progress (from {$this->mTrxFname}), " .
+                                       " performing implicit commit!\n" );
                        }
 
                        $this->doCommit( $fname );