diff options
| author | Pierre Schmitz <pierre@archlinux.de> | 2015-12-20 09:00:55 +0100 |
|---|---|---|
| committer | Pierre Schmitz <pierre@archlinux.de> | 2015-12-20 09:00:55 +0100 |
| commit | a2190ac74dd4d7080b12bab90e552d7aa81209ef (patch) | |
| tree | 8b31f38de9882d18df54cf8d9e0de74167a094eb /includes/api/ApiDelete.php | |
| parent | 15e69f7b20b6596b9148030acce5b59993b95a45 (diff) | |
| parent | 257401d8b2cf661adf36c84b0e3fd1cf85e33c22 (diff) | |
Merge branch 'mw-1.26'
Diffstat (limited to 'includes/api/ApiDelete.php')
| -rw-r--r-- | includes/api/ApiDelete.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/includes/api/ApiDelete.php b/includes/api/ApiDelete.php index d8b57182..bdf02bf1 100644 --- a/includes/api/ApiDelete.php +++ b/includes/api/ApiDelete.php @@ -39,6 +39,8 @@ class ApiDelete extends ApiBase { * result object. */ public function execute() { + $this->useTransactionalTimeLimit(); + $params = $this->extractRequestParams(); $pageObj = $this->getTitleOrPageId( $params, 'fromdbmaster' ); @@ -131,7 +133,7 @@ class ApiDelete extends ApiBase { $error = ''; // Luckily, Article.php provides a reusable delete function that does the hard work for us - return $page->doDeleteArticleReal( $reason, false, 0, true, $error ); + return $page->doDeleteArticleReal( $reason, false, 0, true, $error, $user ); } /** |