[bug 37746] string ids for content model and format.

[lhc/web/wiklou.git] / includes / Export.php

diff --git a/includes/Export.php b/includes/Export.php
index eb240cc..fd0c765 100644 (file)
--- a/includes/Export.php
+++ b/includes/Export.php
@@ -670,7 +670,7 @@ class XmlDumpWriter {
                }
 
                if ( isset( $row->rev_content_model ) && !is_null( $row->rev_content_model )  ) {
-                       $content_model = intval( $row->rev_content_model );
+                       $content_model = strval( $row->rev_content_model );
                } else {
                        // probably using $wgContentHandlerUseDB = false;
                        // @todo: test!
@@ -678,11 +678,10 @@ class XmlDumpWriter {
                        $content_model = ContentHandler::getDefaultModelFor( $title );
                }
 
-               $name = ContentHandler::getContentModelName( $content_model );
-               $out .= "      " . Xml::element('model', array( 'name' => $name ), strval( $content_model ) ) . "\n";
+               $out .= "      " . Xml::element('model', null, strval( $content_model ) ) . "\n";
 
                if ( isset( $row->rev_content_format ) && !is_null( $row->rev_content_format ) ) {
-                       $content_format = intval( $row->rev_content_format );
+                       $content_format = strval( $row->rev_content_format );
                } else {
                        // probably using $wgContentHandlerUseDB = false;
                        // @todo: test!
@@ -690,8 +689,7 @@ class XmlDumpWriter {
                        $content_format = $content_handler->getDefaultFormat();
                }
 
-               $mime = ContentHandler::getContentFormatMimeType( $content_format );
-               $out .= "      " . Xml::element('format', array( 'mime' => $mime ), strval( $content_format ) ) . "\n";
+               $out .= "      " . Xml::element('format', null, strval( $content_format ) ) . "\n";
 
                wfRunHooks( 'XmlDumpWriterWriteRevision', array( &$this, &$out, $row, $text ) );