From: Brion Vibber <brion@users.mediawiki.org>
Date: Tue, 10 Jun 2008 21:14:14 +0000 (+0000)
Subject: Revert r36161 -- these are pretty weird-looking hooks, which seem a bit arbitrary... 
X-Git-Tag: 1.31.0-rc.0~47057
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=364aef1d109c57f2ec7caba6f856e945aa41eff1;p=lhc%2Fweb%2Fwiklou.git

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

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index a7c596ff54..9215660c82 100644
--- 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 64d6756f4b..8451d61f80 100644
--- 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 939f70a5e0..0c428ec73f 100644
--- 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( "