dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Added wfTransactionalTimeLimit() method and applied it
[lhc/web/wiklou.git]
/
includes
/
specials
/
SpecialMergeHistory.php
diff --git
a/includes/specials/SpecialMergeHistory.php
b/includes/specials/SpecialMergeHistory.php
index
1f0b6d4
..
7edf961
100644
(file)
--- a/
includes/specials/SpecialMergeHistory.php
+++ b/
includes/specials/SpecialMergeHistory.php
@@
-109,6
+109,8
@@
class SpecialMergeHistory extends SpecialPage {
}
public function execute( $par ) {
+ $this->useTransactionalTimeLimit();
+
$this->checkPermissions();
$this->checkReadOnly();