From: Brion Vibber <brion@users.mediawiki.org>
Date: Sun, 21 Nov 2004 03:54:26 +0000 (+0000)
Subject: Don't try to dl() the wikidiff module if it's already loaded.
X-Git-Tag: 1.5.0alpha1~1293
X-Git-Url: http://git.cyclocoop.org/%7B%7B%20url_for%28%27admin_vote_del%27%2C%20idvote=vote.voteid%29%20%7D%7D?a=commitdiff_plain;h=a099de2322bf466509d483c4f3b963eb9c11e600;p=lhc%2Fweb%2Fwiklou.git

Don't try to dl() the wikidiff module if it's already loaded.
---

diff --git a/includes/DifferenceEngine.php b/includes/DifferenceEngine.php
index b217a00964..c5ade6eacf 100644
--- a/includes/DifferenceEngine.php
+++ b/includes/DifferenceEngine.php
@@ -229,7 +229,9 @@ class DifferenceEngine {
 			# input text to be HTML-escaped already
 			$otext = str_replace( "\r\n", "\n", htmlspecialchars ( $otext ) );
 			$ntext = str_replace( "\r\n", "\n", htmlspecialchars ( $ntext ) );
-			dl('php_wikidiff.so');
+			if( !function_exists( 'wikidiff_do_diff' ) ) {
+				dl('php_wikidiff.so');
+			}
 			$out .= wikidiff_do_diff( $otext, $ntext, 2 );
 		} else {
 			$ota = explode( "\n", str_replace( "\r\n", "\n", $otext ) );