dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 2:
a35adef
)
Merge "Extract addition of conflict header explanation"
author
jenkins-bot
<jenkins-bot@gerrit.wikimedia.org>
Wed, 9 Nov 2016 17:04:37 +0000
(17:04 +0000)
committer
Gerrit Code Review
<gerrit@wikimedia.org>
Wed, 9 Nov 2016 17:04:37 +0000
(17:04 +0000)
includes/EditPage.php
patch
|
blob
|
history
diff --git
a/includes/EditPage.php
b/includes/EditPage.php
index
85c14fc
..
24fa89a
100644
(file)
--- a/
includes/EditPage.php
+++ b/
includes/EditPage.php
@@
-2866,6
+2866,7
@@
class EditPage {
}
protected function showHeader() {
+ global $wgOut, $wgUser;
global $wgAllowUserCss, $wgAllowUserJs;
if ( $this->isConflict ) {