From: Kunal Mehta <legoktm@member.fsf.org>
Date: Mon, 17 Jul 2017 21:07:45 +0000 (-0700)
Subject: Avoid globals in EditPage::__construct()
X-Git-Tag: 1.31.0-rc.0~2687^2
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22auteur_infos%22%2C%20%22id_auteur=%24id%22%29%20.%20%22?a=commitdiff_plain;h=4fa0c27cc83b8ed621db41c05cff32106423be02;hp=8338cc0917c9b2631636187b36b440e2510c78db;p=lhc%2Fweb%2Fwiklou.git

Avoid globals in EditPage::__construct()

Change-Id: Icb1d1042f4bb5e4397c49f20ce26ab9c73e9d0d1
---

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 814c248304..973327b0be 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -422,8 +422,6 @@ class EditPage {
 	 * @param Article $article
 	 */
 	public function __construct( Article $article ) {
-		global $wgOOUIEditPage;
-
 		$this->mArticle = $article;
 		$this->page = $article->getPage(); // model object
 		$this->mTitle = $article->getTitle();
@@ -434,7 +432,7 @@ class EditPage {
 		$handler = ContentHandler::getForModelID( $this->contentModel );
 		$this->contentFormat = $handler->getDefaultFormat();
 
-		$this->oouiEnabled = $wgOOUIEditPage;
+		$this->oouiEnabled = $this->context->getConfig()->get( 'OOUIEditPage' );
 	}
 
 	/**