diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:32:59 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:32:59 -0400 |
| commit | 6dc1997577fab2c366781fd7048144935afa0012 (patch) | |
| tree | 8918d28c7ab4342f0738985e37af1dfc42d0e93a /includes/api/ApiDelete.php | |
| parent | 150f94f051128f367bc89f6b7e5f57eb2a69fc62 (diff) | |
| parent | fa89acd685cb09cdbe1c64cbb721ec64975bbbc1 (diff) | |
Merge commit 'fa89acd'
# Conflicts:
# .gitignore
# extensions/ArchInterWiki.sql
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 ); } /** |