From d0699504c545da0907ea4c7df91e56e3f7d8c8da Mon Sep 17 00:00:00 2001 From: Rotem Liss Date: Sun, 26 Nov 2006 19:01:56 +0000 Subject: [PATCH] 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. --- includes/EditPage.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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. -- 2.20.1