From c1f9b1f7b1b77776192048005dcc66dcf3df2bfb Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sat, 27 Dec 2014 15:41:37 +0100
Subject: Update to MediaWiki 1.24.1

---
 includes/actions/EditAction.php | 38 +++++++++-----------------------------
 1 file changed, 9 insertions(+), 29 deletions(-)

(limited to 'includes/actions/EditAction.php')

diff --git a/includes/actions/EditAction.php b/includes/actions/EditAction.php
index 3dd4c483..88767244 100644
--- a/includes/actions/EditAction.php
+++ b/includes/actions/EditAction.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * action=edit / action=submit handler
+ * action=edit handler
  *
  * Copyright © 2012 Timo Tijhof
  *
@@ -26,8 +26,7 @@
 /**
  * Page edition handler
  *
- * This is a wrapper that will call the EditPage class, or ExternalEdit
- * if $wgUseExternalEditor is set to true and requested by the user.
+ * This is a wrapper that will call the EditPage class or a custom editor from an extension.
  *
  * @ingroup Actions
  */
@@ -42,6 +41,13 @@ class EditAction extends FormlessAction {
 	}
 
 	public function show() {
+		if ( $this->getContext()->getConfig()->get( 'UseMediaWikiUIEverywhere' ) ) {
+			$out = $this->getOutput();
+			$out->addModuleStyles( array(
+				'mediawiki.ui.input',
+				'mediawiki.ui.checkbox',
+			) );
+		}
 		$page = $this->page;
 		$user = $this->getUser();
 
@@ -49,31 +55,5 @@ class EditAction extends FormlessAction {
 			$editor = new EditPage( $page );
 			$editor->edit();
 		}
-
 	}
-
-}
-
-/**
- * Edit submission handler
- *
- * This is the same as EditAction; except that it sets the session cookie.
- *
- * @ingroup Actions
- */
-class SubmitAction extends EditAction {
-
-	public function getName() {
-		return 'submit';
-	}
-
-	public function show() {
-		if ( session_id() == '' ) {
-			// Send a cookie so anons get talk message notifications
-			wfSetupSession();
-		}
-
-		parent::show();
-	}
-
 }
-- 
cgit v1.2.3-54-g00ecf