Merge commit 'fa89acd'

# Conflicts:
#	.gitignore
#	extensions/ArchInterWiki.sql

1 files changed, 8 insertions, 1 deletions

diff --git a/includes/api/ApiUndelete.php b/includes/api/ApiUndelete.php
index c23e9ff6..cd50ee65 100644
--- a/includes/api/ApiUndelete.php
+++ b/includes/api/ApiUndelete.php
@@ -30,6 +30,8 @@
 class ApiUndelete extends ApiBase {
 
 	public function execute() {
+		$this->useTransactionalTimeLimit();
+
 		$params = $this->extractRequestParams();
 
 		if ( !$this->getUser()->isAllowed( 'undelete' ) ) {
@@ -37,7 +39,12 @@ class ApiUndelete extends ApiBase {
 		}
 
 		if ( $this->getUser()->isBlocked() ) {
-			$this->dieUsageMsg( 'blockedtext' );
+			$this->dieUsage(
+				'You have been blocked from editing',
+				'blocked',
+				0,
+				array( 'blockinfo' => ApiQueryUserInfo::getBlockInfo( $this->getUser()->getBlock() ) )
+			);
 		}
 
 		$titleObj = Title::newFromText( $params['title'] );