Merge "Make WikiPage::doDeleteArticle more robust"

diff --cc docs/hooks.txt
index 1e3cf1e,a1c30eb..a7fb873
--- 1/docs/hooks.txt
--- 2/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.

diff --cc includes/page/WikiPage.php
Simple merge