Merge "Use current content model for blank page content (not title default)"

diff --git a/includes/EditPage.php b/includes/EditPage.php
index e4146c5..362f905 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -1310,7 +1310,7 @@ class EditPage {
                        return $this->mPreloadContent;
                }
 
-               $handler = ContentHandler::getForTitle( $this->getTitle() );
+               $handler = ContentHandler::getForModelID( $this->contentModel );
 
                if ( $preload === '' ) {
                        return $handler->makeEmptyContent();