Revert r36161 -- these are pretty weird-looking hooks, which seem a bit arbitrary...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index a7c596f..9215660 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -151,8 +151,6 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Add a new hook LinkerMakeExternalLink to allow extensions to modify the output of
   external links.
 * (bug 14132) Allow user to disable bot edits from being output to UDP. 
-* Two new hooks in EditPage.php: EditPage::AfterEdit:Form and
-  EditPage:BeforeDisplayingTextbox
   
 === Bug fixes in 1.13 ===
 

diff --git a/docs/hooks.txt b/docs/hooks.txt
index 64d6756..8451d61 100644 (file)
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -533,17 +533,10 @@ $error: error message to return
 &$text: Text to preload with
 &$title: Title object representing the page being created
 
-'EditPage::AfterEdit:Form': After the edit textbox has been displayed
-&$this: EditPage instance (object)
-
 'EditPage::attemptSave': called before an article is
 saved, that is before insertNewArticle() is called
 &$editpage_Obj: the current EditPage object
 
-'EditPage:BeforeDisplayingTextbox': Before the edit textbox is displayed
-&$this: EditPage instance (object)
-&$hidden: extra parameters of the textarea element, by default it is style="display: none;"
-
 'EditPage::showEditForm:fields': allows injection of form field into edit form
 &$editor: the EditPage instance for reference
 &$out: an OutputPage instance to write to

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 939f70a..0c428ec 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -1350,8 +1350,6 @@ END
                        // mode will show an extra newline. A bit annoying.
                        $encodedtext .= "\n";
                }
-               
-               wfRunHooks( 'EditPage:BeforeDisplayingTextbox', array (&$this, &$hidden) );
 
                $wgOut->addHTML( <<<END
 $recreate
@@ -1363,8 +1361,6 @@ cols='{$cols}'{$ew} $hidden>{$encodedtext}</textarea>
 END
 );
 
-               wfRunHooks( 'EditPage::AfterEdit:Form', array (&$this) );
-
                $wgOut->wrapWikiMsg( "<div id=\"editpage-copywarn\">\n$1\n</div>", $copywarnMsg );
                $wgOut->addHTML( $this->editFormTextAfterWarn );
                $wgOut->addHTML( "