From: WMDE-Fisch <christoph.jauera@wikimedia.de>
Date: Wed, 9 Nov 2016 16:48:12 +0000 (+0100)
Subject: Fix missing globals
X-Git-Tag: 1.31.0-rc.0~4913
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/pie.php?a=commitdiff_plain;h=f7928ac36df614d8868d35d4d4486671761b5fd2;p=lhc%2Fweb%2Fwiklou.git

Fix missing globals

Apperently something went wrong when manual rebasing
If5909f7a16c98504e78388a5ea6c26196f82cd12 and went unnoticed.

Change-Id: Icf8964b0fa0857a44814df3bb11eaf2907e9af56
---

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 78ef2e32cb..3c47a3fd0d 100644
--- 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 ) {