Add an OutputPage to the EditPage::showEditForm:initial to match the EditPage::showEd...

diff --git a/docs/hooks.txt b/docs/hooks.txt
index 209ff2e..e1f261a 100644 (file)
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -774,12 +774,13 @@ $request: Webrequest
 return value is ignored (should always return true)
 
 'EditPage::showEditForm:fields': allows injection of form field into edit form
-&$editor: the EditPage instance for reference
-&$out: an OutputPage instance to write to
+$editor: the EditPage instance for reference
+$out: an OutputPage instance to write to
 return value is ignored (should always return true)
 
 'EditPage::showEditForm:initial': before showing the edit form
 $editor: EditPage instance (object)
+$out: an OutputPage instance to write to
 
 Return false to halt editing; you'll need to handle error messages, etc.
 yourself. Alternatively, modifying $error and returning true will cause the

diff --git a/includes/EditPage.php b/includes/EditPage.php
index d409252..28ace46 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -1732,7 +1732,7 @@ class EditPage {
                        $previewOutput = $this->getPreviewText();
                }
 
-               wfRunHooks( 'EditPage::showEditForm:initial', array( &$this ) );
+               wfRunHooks( 'EditPage::showEditForm:initial', array( &$this, &$wgOut ) );
 
                $this->setHeaders();