From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Mon, 29 Aug 2016 23:28:12 +0000 (+0000)
Subject: Merge "Make WikiPage::doDeleteArticle more robust"
X-Git-Tag: 1.31.0-rc.0~5843
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/membres/fiche.php?a=commitdiff_plain;h=bb8608c98a3d677d8557dd7056a7434c7c38c055;p=lhc%2Fweb%2Fwiklou.git

Merge "Make WikiPage::doDeleteArticle more robust"
---

bb8608c98a3d677d8557dd7056a7434c7c38c055
diff --cc docs/hooks.txt
index 1e3cf1e105,a1c30eb7d1..a7fb873bf8
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@@ -596,9 -606,8 +596,9 @@@ $outputPage: OutputPage that can be use
  &$user: the user that deleted the article
  $reason: the reason the article was deleted
  $id: id of the article that was deleted
- $content: the Content of the deleted page
+ $content: the Content of the deleted page (or null, when deleting a broken page)
  $logEntry: the ManualLogEntry used to record the deletion
 +$archivedRevisionCount: the number of revisions archived during the deletion
  
  'ArticleEditUpdateNewTalk': Before updating user_newtalk when a user talk page
  was changed.