Update RELEASE-NOTES and hooks.txt for r36692. Contrary to the commit message, the...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 526fbb6..d8a7a58 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -170,6 +170,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Add zh-mo and zh-my variants for the zh language
 * (bugs 4832, 9481, 12890) Special:Recentchangeslinked now has all options that
   are in Special:Recentchanges
+* Allow an $error message to be passed to ArticleDelete hook
   
 === Bug fixes in 1.13 ===
 

diff --git a/docs/hooks.txt b/docs/hooks.txt
index c1475ac..fe856a2 100644 (file)
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -289,6 +289,8 @@ $content: the content (string) of the article
 $article: the article (object) being deleted
 $user: the user (object) deleting the article
 $reason: the reason (string) the article is being deleted
+$error: if the deletion was prohibited, the (raw HTML) error message to display
+  (added in 1.13)
 
 'ArticleDeleteComplete': after an article is deleted
 $article: the article that was deleted