From 08aa4418c30cfc18ccc69a0f0f9cb9e17be6c196 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Mon, 12 Aug 2013 09:28:15 +0200 Subject: Update to MediaWiki 1.21.1 --- includes/Export.php | 119 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 69 insertions(+), 50 deletions(-) (limited to 'includes/Export.php') diff --git a/includes/Export.php b/includes/Export.php index f01fb237..d8cc0242 100644 --- a/includes/Export.php +++ b/includes/Export.php @@ -31,8 +31,8 @@ * @ingroup SpecialPage Dump */ class WikiExporter { - var $list_authors = false ; # Return distinct author list (when not returning full history) - var $author_list = "" ; + var $list_authors = false; # Return distinct author list (when not returning full history) + var $author_list = ""; var $dumpUploads = false; var $dumpUploadFileContents = false; @@ -63,7 +63,7 @@ class WikiExporter { * @return string */ public static function schemaVersion() { - return "0.7"; + return "0.8"; } /** @@ -80,17 +80,17 @@ class WikiExporter { * offset: non-inclusive offset at which to start the query * limit: maximum number of rows to return * dir: "asc" or "desc" timestamp order - * @param $buffer Int: one of WikiExporter::BUFFER or WikiExporter::STREAM - * @param $text Int: one of WikiExporter::TEXT or WikiExporter::STUB + * @param int $buffer one of WikiExporter::BUFFER or WikiExporter::STREAM + * @param int $text one of WikiExporter::TEXT or WikiExporter::STUB */ - function __construct( &$db, $history = WikiExporter::CURRENT, + function __construct( $db, $history = WikiExporter::CURRENT, $buffer = WikiExporter::BUFFER, $text = WikiExporter::TEXT ) { - $this->db =& $db; + $this->db = $db; $this->history = $history; - $this->buffer = $buffer; - $this->writer = new XmlDumpWriter(); - $this->sink = new DumpOutput(); - $this->text = $text; + $this->buffer = $buffer; + $this->writer = new XmlDumpWriter(); + $this->sink = new DumpOutput(); + $this->text = $text; } /** @@ -126,7 +126,7 @@ class WikiExporter { /** * Dumps a series of page and revision records for those pages * in the database falling within the page_id range given. - * @param $start Int: inclusive lower limit (this id is included) + * @param int $start inclusive lower limit (this id is included) * @param $end Int: Exclusive upper limit (this id is not included) * If 0, no upper limit. */ @@ -141,7 +141,7 @@ class WikiExporter { /** * Dumps a series of page and revision records for those pages * in the database with revisions falling within the rev_id range given. - * @param $start Int: inclusive lower limit (this id is included) + * @param int $start inclusive lower limit (this id is included) * @param $end Int: Exclusive upper limit (this id is not included) * If 0, no upper limit. */ @@ -226,7 +226,7 @@ class WikiExporter { foreach ( $res as $row ) { $this->author_list .= "" . "" . - htmlentities( $row->rev_user_text ) . + htmlentities( $row->rev_user_text ) . "" . "" . $row->rev_user . @@ -330,7 +330,7 @@ class WikiExporter { $join['revision'] = array( 'INNER JOIN', 'page_id=rev_page' ); } elseif ( $this->history & WikiExporter::CURRENT ) { # Latest revision dumps... - if ( $this->list_authors && $cond != '' ) { // List authors, if so desired + if ( $this->list_authors && $cond != '' ) { // List authors, if so desired $this->do_list_authors( $cond ); } $join['revision'] = array( 'INNER JOIN', 'page_id=rev_page AND page_latest=rev_id' ); @@ -348,7 +348,7 @@ class WikiExporter { $join['revision'] = array( 'INNER JOIN', 'page_id=rev_page' ); $opts['ORDER BY'] = array( 'rev_page ASC', 'rev_id ASC' ); } else { - # Uknown history specification parameter? + # Unknown history specification parameter? wfProfileOut( __METHOD__ ); throw new MWException( __METHOD__ . " given invalid history dump type." ); } @@ -427,10 +427,10 @@ class WikiExporter { protected function outputPageStream( $resultset ) { $last = null; foreach ( $resultset as $row ) { - if ( is_null( $last ) || + if ( $last === null || $last->page_namespace != $row->page_namespace || - $last->page_title != $row->page_title ) { - if ( isset( $last ) ) { + $last->page_title != $row->page_title ) { + if ( $last !== null ) { $output = ''; if ( $this->dumpUploads ) { $output .= $this->writer->writeUploads( $last, $this->dumpUploadFileContents ); @@ -445,7 +445,7 @@ class WikiExporter { $output = $this->writer->writeRevision( $row ); $this->sink->writeRevision( $row, $output ); } - if ( isset( $last ) ) { + if ( $last !== null ) { $output = ''; if ( $this->dumpUploads ) { $output .= $this->writer->writeUploads( $last, $this->dumpUploadFileContents ); @@ -498,7 +498,7 @@ class XmlDumpWriter { 'xmlns' => "http://www.mediawiki.org/xml/export-$ver/", 'xmlns:xsi' => "http://www.w3.org/2001/XMLSchema-instance", 'xsi:schemaLocation' => "http://www.mediawiki.org/xml/export-$ver/ " . - "http://www.mediawiki.org/xml/export-$ver.xsd", + "http://www.mediawiki.org/xml/export-$ver.xsd", #TODO: how do we get a new version up there? 'version' => $ver, 'xml:lang' => $wgLanguageCode ), null ) . @@ -634,37 +634,31 @@ class XmlDumpWriter { function writeRevision( $row ) { wfProfileIn( __METHOD__ ); - $out = " \n"; + $out = " \n"; $out .= " " . Xml::element( 'id', null, strval( $row->rev_id ) ) . "\n"; - if( $row->rev_parent_id ) { + if( isset( $row->rev_parent_id ) && $row->rev_parent_id ) { $out .= " " . Xml::element( 'parentid', null, strval( $row->rev_parent_id ) ) . "\n"; } $out .= $this->writeTimestamp( $row->rev_timestamp ); - if ( $row->rev_deleted & Revision::DELETED_USER ) { + if ( isset( $row->rev_deleted ) && ( $row->rev_deleted & Revision::DELETED_USER ) ) { $out .= " " . Xml::element( 'contributor', array( 'deleted' => 'deleted' ) ) . "\n"; } else { $out .= $this->writeContributor( $row->rev_user, $row->rev_user_text ); } - if ( $row->rev_minor_edit ) { - $out .= " \n"; + if ( isset( $row->rev_minor_edit ) && $row->rev_minor_edit ) { + $out .= " \n"; } - if ( $row->rev_deleted & Revision::DELETED_COMMENT ) { + if ( isset( $row->rev_deleted ) && ( $row->rev_deleted & Revision::DELETED_COMMENT ) ) { $out .= " " . Xml::element( 'comment', array( 'deleted' => 'deleted' ) ) . "\n"; } elseif ( $row->rev_comment != '' ) { $out .= " " . Xml::elementClean( 'comment', array(), strval( $row->rev_comment ) ) . "\n"; } - if ( $row->rev_sha1 && !( $row->rev_deleted & Revision::DELETED_TEXT ) ) { - $out .= " " . Xml::element('sha1', null, strval( $row->rev_sha1 ) ) . "\n"; - } else { - $out .= " \n"; - } - $text = ''; - if ( $row->rev_deleted & Revision::DELETED_TEXT ) { + if ( isset( $row->rev_deleted ) && ( $row->rev_deleted & Revision::DELETED_TEXT ) ) { $out .= " " . Xml::element( 'text', array( 'deleted' => 'deleted' ) ) . "\n"; } elseif ( isset( $row->old_text ) ) { // Raw text from the database may have invalid chars @@ -679,6 +673,34 @@ class XmlDumpWriter { "" ) . "\n"; } + if ( isset( $row->rev_sha1 ) && $row->rev_sha1 && !( $row->rev_deleted & Revision::DELETED_TEXT ) ) { + $out .= " " . Xml::element( 'sha1', null, strval( $row->rev_sha1 ) ) . "\n"; + } else { + $out .= " \n"; + } + + if ( isset( $row->rev_content_model ) && !is_null( $row->rev_content_model ) ) { + $content_model = strval( $row->rev_content_model ); + } else { + // probably using $wgContentHandlerUseDB = false; + // @todo: test! + $title = Title::makeTitle( $row->page_namespace, $row->page_title ); + $content_model = ContentHandler::getDefaultModelFor( $title ); + } + + $out .= " " . Xml::element( 'model', null, strval( $content_model ) ) . "\n"; + + if ( isset( $row->rev_content_format ) && !is_null( $row->rev_content_format ) ) { + $content_format = strval( $row->rev_content_format ); + } else { + // probably using $wgContentHandlerUseDB = false; + // @todo: test! + $content_handler = ContentHandler::getForModelID( $content_model ); + $content_format = $content_handler->getDefaultFormat(); + } + + $out .= " " . Xml::element( 'format', null, strval( $content_format ) ) . "\n"; + wfRunHooks( 'XmlDumpWriterWriteRevision', array( &$this, &$out, $row, $text ) ); $out .= " \n"; @@ -698,7 +720,7 @@ class XmlDumpWriter { function writeLogItem( $row ) { wfProfileIn( __METHOD__ ); - $out = " \n"; + $out = " \n"; $out .= " " . Xml::element( 'id', null, strval( $row->log_id ) ) . "\n"; $out .= $this->writeTimestamp( $row->log_timestamp, " " ); @@ -736,7 +758,7 @@ class XmlDumpWriter { /** * @param $timestamp string - * @param $indent string Default to six spaces + * @param string $indent Default to six spaces * @return string */ function writeTimestamp( $timestamp, $indent = " " ) { @@ -747,7 +769,7 @@ class XmlDumpWriter { /** * @param $id * @param $text string - * @param $indent string Default to six spaces + * @param string $indent Default to six spaces * @return string */ function writeContributor( $id, $text, $indent = " " ) { @@ -849,9 +871,8 @@ class XmlDumpWriter { } } - /** - * Base class for output stream; prints to stdout or buffer or whereever. + * Base class for output stream; prints to stdout or buffer or wherever. * @ingroup Dump */ class DumpOutput { @@ -918,7 +939,6 @@ class DumpOutput { * @param $newname mixed File name. May be a string or an array with one element */ function closeRenameAndReopen( $newname ) { - return; } /** @@ -926,10 +946,9 @@ class DumpOutput { * Use this for the last piece of a file written out * at specified checkpoints (e.g. every n hours). * @param $newname mixed File name. May be a string or an array with one element - * @param $open bool If true, a new file with the old filename will be opened again for writing (default: false) + * @param bool $open If true, a new file with the old filename will be opened again for writing (default: false) */ function closeAndRename( $newname, $open = false ) { - return; } /** @@ -938,7 +957,7 @@ class DumpOutput { * @return null */ function getFilenames() { - return NULL; + return null; } } @@ -987,7 +1006,7 @@ class DumpFileOutput extends DumpOutput { * @throws MWException */ function renameOrException( $newname ) { - if (! rename( $this->filename, $newname ) ) { + if ( !rename( $this->filename, $newname ) ) { throw new MWException( __METHOD__ . ": rename of file {$this->filename} to $newname failed\n" ); } } @@ -1050,7 +1069,7 @@ class DumpPipeOutput extends DumpFileOutput { */ function __construct( $command, $file = null ) { if ( !is_null( $file ) ) { - $command .= " > " . wfEscapeShellArg( $file ); + $command .= " > " . wfEscapeShellArg( $file ); } $this->startCommand( $command ); @@ -1106,7 +1125,7 @@ class DumpPipeOutput extends DumpFileOutput { $this->renameOrException( $newname ); if ( $open ) { $command = $this->command; - $command .= " > " . wfEscapeShellArg( $this->filename ); + $command .= " > " . wfEscapeShellArg( $this->filename ); $this->startCommand( $command ); } } @@ -1325,6 +1344,7 @@ class DumpNamespaceFilter extends DumpFilter { /** * @param $sink DumpOutput * @param $param + * @throws MWException */ function __construct( &$sink, $param ) { parent::__construct( $sink ); @@ -1338,7 +1358,7 @@ class DumpNamespaceFilter extends DumpFilter { "NS_PROJECT_TALK" => NS_PROJECT_TALK, "NS_FILE" => NS_FILE, "NS_FILE_TALK" => NS_FILE_TALK, - "NS_IMAGE" => NS_IMAGE, // NS_IMAGE is an alias for NS_FILE + "NS_IMAGE" => NS_IMAGE, // NS_IMAGE is an alias for NS_FILE "NS_IMAGE_TALK" => NS_IMAGE_TALK, "NS_MEDIAWIKI" => NS_MEDIAWIKI, "NS_MEDIAWIKI_TALK" => NS_MEDIAWIKI_TALK, @@ -1378,7 +1398,6 @@ class DumpNamespaceFilter extends DumpFilter { } } - /** * Dump output filter to include only the last revision in each page sequence. * @ingroup Dump @@ -1423,7 +1442,7 @@ class DumpLatestFilter extends DumpFilter { } /** - * Base class for output stream; prints to stdout or buffer or whereever. + * Base class for output stream; prints to stdout or buffer or wherever. * @ingroup Dump */ class DumpMultiWriter { @@ -1506,7 +1525,7 @@ class DumpMultiWriter { function getFilenames() { $filenames = array(); for ( $i = 0; $i < $this->count; $i++ ) { - $filenames[] = $this->sinks[$i]->getFilenames(); + $filenames[] = $this->sinks[$i]->getFilenames(); } return $filenames; } -- cgit v1.2.3-54-g00ecf