X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FRevision.php;h=32ee259f3d7dea32eb6804ac7c4a60a49d1fa9b4;hb=7e5d2b90e31d77d68604a6420e3c8c67727cda6b;hp=9bb4d16a919fa01a5e956c18bfb71f1745e91ac9;hpb=f968187c10f30cf2ed6a6f449d296685e23332b2;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/Revision.php b/includes/Revision.php
index 9bb4d16a91..32ee259f3d 100644
--- a/includes/Revision.php
+++ b/includes/Revision.php
@@ -194,8 +194,8 @@ class Revision implements IDBAccessObject {
 
 		if ( !isset( $attribs['title'] )
 			&& isset( $row->ar_namespace )
-			&& isset( $row->ar_title ) ) {
-
+			&& isset( $row->ar_title )
+		) {
 			$attribs['title'] = Title::makeTitle( $row->ar_namespace, $row->ar_title );
 		}
 
@@ -1087,7 +1087,7 @@ class Revision implements IDBAccessObject {
 	/**
 	 * Returns the content model for this revision.
 	 *
-	 * If no content model was stored in the database, $this->getTitle()->getContentModel() is
+	 * If no content model was stored in the database, the default content model for the title is
 	 * used to determine the content model to use. If no title is know, CONTENT_MODEL_WIKITEXT
 	 * is used as a last resort.
 	 *
@@ -1097,7 +1097,11 @@ class Revision implements IDBAccessObject {
 	public function getContentModel() {
 		if ( !$this->mContentModel ) {
 			$title = $this->getTitle();
-			$this->mContentModel = ( $title ? $title->getContentModel() : CONTENT_MODEL_WIKITEXT );
+			if ( $title ) {
+				$this->mContentModel = ContentHandler::getDefaultModelFor( $title );
+			} else {
+				$this->mContentModel = CONTENT_MODEL_WIKITEXT;
+			}
 
 			assert( !empty( $this->mContentModel ) );
 		}
@@ -1637,8 +1641,9 @@ class Revision implements IDBAccessObject {
 				$row['content_format'] = $current->rev_content_format;
 			}
 
+			$row['title'] = Title::makeTitle( $current->page_namespace, $current->page_title );
+
 			$revision = new Revision( $row );
-			$revision->setTitle( Title::makeTitle( $current->page_namespace, $current->page_title ) );
 		} else {
 			$revision = null;
 		}