Merge "Add SPARQL client to core"

[lhc/web/wiklou.git] / includes / export / XmlDumpWriter.php

diff --git a/includes/export/XmlDumpWriter.php b/includes/export/XmlDumpWriter.php
index 990f16d..e1c12de 100644 (file)
--- a/includes/export/XmlDumpWriter.php
+++ b/includes/export/XmlDumpWriter.php
@@ -219,7 +219,7 @@ class XmlDumpWriter {
                if ( isset( $row->rev_deleted ) && ( $row->rev_deleted & Revision::DELETED_COMMENT ) ) {
                        $out .= "      " . Xml::element( 'comment', [ 'deleted' => 'deleted' ] ) . "\n";
                } else {
-                       $comment = CommentStore::newKey( 'rev_comment' )->getComment( $row )->text;
+                       $comment = CommentStore::getStore()->getComment( 'rev_comment', $row )->text;
                        if ( $comment != '' ) {
                                $out .= "      " . Xml::elementClean( 'comment', [], strval( $comment ) ) . "\n";
                        }
@@ -303,7 +303,7 @@ class XmlDumpWriter {
                if ( $row->log_deleted & LogPage::DELETED_COMMENT ) {
                        $out .= "    " . Xml::element( 'comment', [ 'deleted' => 'deleted' ] ) . "\n";
                } else {
-                       $comment = CommentStore::newKey( 'log_comment' )->getComment( $row )->text;
+                       $comment = CommentStore::getStore()->getComment( 'log_comment', $row )->text;
                        if ( $comment != '' ) {
                                $out .= "    " . Xml::elementClean( 'comment', null, strval( $comment ) ) . "\n";
                        }
@@ -403,7 +403,7 @@ class XmlDumpWriter {
                if ( $file->isDeleted( File::DELETED_COMMENT ) ) {
                        $comment = Xml::element( 'comment', [ 'deleted' => 'deleted' ] );
                } else {
-                       $comment = Xml::elementClean( 'comment', null, $file->getDescription() );
+                       $comment = Xml::elementClean( 'comment', null, strval( $file->getDescription() ) );
                }
                return "    <upload>\n" .
                        $this->writeTimestamp( $file->getTimestamp() ) .