From: daniel <daniel.kinzler@wikimedia.de>
Date: Thu, 24 May 2012 16:30:03 +0000 (+0200)
Subject: fix EditAction not to use ContentHandler
X-Git-Tag: 1.31.0-rc.0~22097^2^2~153^2
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=f89987fec1e91da9a9c7a714f53374f883c4c3f2;p=lhc%2Fweb%2Fwiklou.git

fix EditAction not to use ContentHandler
---

diff --git a/includes/actions/EditAction.php b/includes/actions/EditAction.php
index 3771586df3..1c97b26c50 100644
--- a/includes/actions/EditAction.php
+++ b/includes/actions/EditAction.php
@@ -40,19 +40,14 @@ class EditAction extends FormlessAction {
 		$context = $this->getContext();
 
 		if ( wfRunHooks( 'CustomEditor', array( $page, $user ) ) ) {
-			if ( ( $page->getContent() instanceof TextContentHandler ) ) {
-				$modelName = ContentHandler::getContentModelName( $page->getContentModel() );
-				throw new MWException( "Can't use default editor for non-text content. ContentHandler for $modelName apparently does not provide an action handler for the edit action." );
-			}
-
 			if ( ExternalEdit::useExternalEngine( $context, 'edit' )
 				&& $this->getName() == 'edit' && !$request->getVal( 'section' )
 				&& !$request->getVal( 'oldid' ) )
 			{
-				$extedit = $handler->createExternalEdit( $context );
+				$extedit = new ExternalEdit( $context );
 				$extedit->execute();
 			} else {
-				$editor = $handler->createEditPage( $page );
+				$editor = new EditPage( $page );
 				$editor->edit();
 			}
 		}
@@ -76,4 +71,4 @@ class SubmitAction extends EditAction {
 		parent::show();
 	}
 
-}
+}
\ No newline at end of file