From: Rotem Liss <rotem@users.mediawiki.org>
Date: Sun, 26 Nov 2006 19:01:56 +0000 (+0000)
Subject: Fixing a PHP warning about passing variables by reference from the function call... 
X-Git-Tag: 1.31.0-rc.0~55071
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dcompta/comptes/journal.php?a=commitdiff_plain;h=d0699504c545da0907ea4c7df91e56e3f7d8c8da;p=lhc%2Fweb%2Fwiklou.git

Fixing a PHP warning about passing variables by reference from the function call (should be passed from the function decleration itself, and they are passed in that way), like the other call to wfMerge in this file; tested.
---

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 482b4157d3..bf24b84359 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -110,7 +110,7 @@ class EditPage {
 					$oldrev_text = $oldrev->getText();
 					$currev_text = $text;
 	
-					$result = wfMerge($undorev_text, $oldrev_text, $currev_text, &$text);
+					$result = wfMerge($undorev_text, $oldrev_text, $currev_text, $text);
 	
 					if (!$result) {
 						#Undoing failed. Bailing out with regular revision text.