Self-revert r91453: not a well thought out addition to the EditPage::showEditForm...

diff --git a/RELEASE-NOTES-1.18 b/RELEASE-NOTES-1.18
index 16d9f1b..a6d7491 100644 (file)
--- a/RELEASE-NOTES-1.18
+++ b/RELEASE-NOTES-1.18
@@ -185,8 +185,6 @@ production.
   the relevant section of the category.
 * (bug 29109) Allow the automatic edit summary for redirect creation
   show the first bit of the new redirect page.
-* (bug 5800) Added $formCallback as a parameter to the hook
-  EditPage::showEditForm:initial.
 * (bug 29723) mw.util.wikiGetlink() now defaults to wgPageName.
 * (bug 29680) Add GetDefaultSortkey hook to override the default sortkey.
 * (bug 16699) {{#language:}} accepts second parameter to specify the language in

diff --git a/docs/hooks.txt b/docs/hooks.txt
index 6b8bf40..dbf9a52 100644 (file)
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -741,7 +741,6 @@ return value is ignored (should always return true)
 
 'EditPage::showEditForm:initial': before showing the edit form
 $editor: EditPage instance (object)
-$formCallback: Array for callback of modifying the edit form
 
 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 f3b24c5..9563701 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -1330,7 +1330,7 @@ class EditPage {
                        $previewOutput = $this->getPreviewText();
                }
 
-               wfRunHooks( 'EditPage::showEditForm:initial', array( &$this, &$formCallback ) );
+               wfRunHooks( 'EditPage::showEditForm:initial', array( &$this ) );
 
                $this->setHeaders();