From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Mon, 11 Apr 2011 16:52:51 +0000 (+0000)
Subject: No need to call wfSuppressWarnings() and wfRestoreWarnings(); wfDl() already does... 
X-Git-Tag: 1.31.0-rc.0~30932
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=b5966436ea896282c875c1a3b06840b2166c149d;p=lhc%2Fweb%2Fwiklou.git

No need to call wfSuppressWarnings() and wfRestoreWarnings(); wfDl() already does this
---

diff --git a/includes/diff/DifferenceEngine.php b/includes/diff/DifferenceEngine.php
index 205962abc9..4dabcd1ffb 100644
--- a/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@ -697,16 +697,12 @@ CONTROL;
 		global $wgExternalDiffEngine;
 		if ( $wgExternalDiffEngine == 'wikidiff' && !function_exists( 'wikidiff_do_diff' ) ) {
 			wfProfileIn( __METHOD__ . '-php_wikidiff.so' );
-			wfSuppressWarnings();
 			wfDl( 'php_wikidiff' );
-			wfRestoreWarnings();
 			wfProfileOut( __METHOD__ . '-php_wikidiff.so' );
 		}
 		else if ( $wgExternalDiffEngine == 'wikidiff2' && !function_exists( 'wikidiff2_do_diff' ) ) {
 			wfProfileIn( __METHOD__ . '-php_wikidiff2.so' );
-			wfSuppressWarnings();
 			wfDl( 'wikidiff2' );
-			wfRestoreWarnings();
 			wfProfileOut( __METHOD__ . '-php_wikidiff2.so' );
 		}
 	}