Actually fix bug #20706 - Next time I will read more carefully and test more thouroug...

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

diff --git a/includes/Export.php b/includes/Export.php
index ff702c1..daeadc5 100644 (file)
--- a/includes/Export.php
+++ b/includes/Export.php
@@ -55,6 +55,7 @@ class WikiExporter {
         *                   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
         */
        function __construct( &$db, $history = WikiExporter::CURRENT,
                        $buffer = WikiExporter::BUFFER, $text = WikiExporter::TEXT ) {
@@ -151,15 +152,14 @@ class WikiExporter {
        # Not called by default (depends on $this->list_authors)
        # Can be set by Special:Export when not exporting whole history
        protected function do_list_authors( $page , $revision , $cond ) {
-               $fname = "do_list_authors" ;
-               wfProfileIn( $fname );
+               wfProfileIn( __METHOD__ );
                $this->author_list = "<contributors>";
                //rev_deleted
                $nothidden = '('.$this->db->bitAnd('rev_deleted', Revision::DELETED_USER) . ') = 0';
 
                $sql = "SELECT DISTINCT rev_user_text,rev_user FROM {$page},{$revision} 
                WHERE page_id=rev_page AND $nothidden AND " . $cond ;
-               $result = $this->db->query( $sql, $fname );
+               $result = $this->db->query( $sql, __METHOD__ );
                $resultset = $this->db->resultObject( $result );
                while( $row = $resultset->fetchObject() ) {
                        $this->author_list .= "<contributor>" .
@@ -171,7 +171,7 @@ class WikiExporter {
                                "</id>" .
                                "</contributor>";
                }
-               wfProfileOut( $fname );
+               wfProfileOut( __METHOD__ );
                $this->author_list .= "</contributors>";
        }
 
@@ -207,24 +207,8 @@ class WikiExporter {
                        $opts = array( 'ORDER BY' => 'page_id ASC' );
                        $opts['USE INDEX'] = array();
                        $join = array();
-                       # Latest revision dumps...
-                       if( $this->history & WikiExporter::CURRENT ) {
-                               if( $this->list_authors && $cond != '' )  { // List authors, if so desired
-                                       list($page,$revision) = $this->db->tableNamesN('page','revision');
-                                       $this->do_list_authors( $page, $revision, $cond );
-                               }
-                               $join['revision'] = array('INNER JOIN','page_id=rev_page AND page_latest=rev_id');
-                       # "Stable" revision dumps...
-                       } elseif( $this->history & WikiExporter::STABLE ) {
-                               # Default JOIN, to be overridden...
-                               $join['revision'] = array('INNER JOIN','page_id=rev_page AND page_latest=rev_id');
-                               # One, and only one hook should set this, and return false
-                               if( wfRunHooks( 'WikiExporter::dumpStableQuery', array(&$tables,&$opts,&$join) ) ) {
-                                       wfProfileOut( __METHOD__ );
-                                       return new WikiError( __METHOD__." given invalid history dump type." );
-                               }
-                       # Time offset/limit for all pages/history...
-                       } elseif( is_array( $this->history ) ) {
+                       if( is_array( $this->history ) ) {
+                               # Time offset/limit for all pages/history...
                                $revJoin = 'page_id=rev_page';
                                # Set time order
                                if( $this->history['dir'] == 'asc' ) {
@@ -244,11 +228,27 @@ class WikiExporter {
                                if( !empty( $this->history['limit'] ) ) {
                                        $opts['LIMIT'] = intval( $this->history['limit'] );
                                }
-                       # Full history dumps...
                        } elseif( $this->history & WikiExporter::FULL ) {
+                               # Full history dumps...
                                $join['revision'] = array('INNER JOIN','page_id=rev_page');
-                       # Uknown history specification parameter?
+                       } elseif( $this->history & WikiExporter::CURRENT ) {
+                               # Latest revision dumps...
+                               if( $this->list_authors && $cond != '' )  { // List authors, if so desired
+                                       list($page,$revision) = $this->db->tableNamesN('page','revision');
+                                       $this->do_list_authors( $page, $revision, $cond );
+                               }
+                               $join['revision'] = array('INNER JOIN','page_id=rev_page AND page_latest=rev_id');
+                       } elseif( $this->history & WikiExporter::STABLE ) {
+                               # "Stable" revision dumps...
+                               # Default JOIN, to be overridden...
+                               $join['revision'] = array('INNER JOIN','page_id=rev_page AND page_latest=rev_id');
+                               # One, and only one hook should set this, and return false
+                               if( wfRunHooks( 'WikiExporter::dumpStableQuery', array(&$tables,&$opts,&$join) ) ) {
+                                       wfProfileOut( __METHOD__ );
+                                       return new WikiError( __METHOD__." given invalid history dump type." );
+                               }
                        } else {
+                               # Uknown history specification parameter?
                                wfProfileOut( __METHOD__ );
                                return new WikiError( __METHOD__." given invalid history dump type." );
                        }
@@ -413,7 +413,11 @@ class XmlDumpWriter {
                global $wgContLang;
                $spaces = "<namespaces>\n";
                foreach( $wgContLang->getFormattedNamespaces() as $ns => $title ) {
-                       $spaces .= '      ' . Xml::element( 'namespace', array( 'key' => $ns ), $title ) . "\n";
+                       $spaces .= '      ' . 
+                               Xml::element( 'namespace', 
+                                       array(  'key' => $ns,
+                                                       'case' => MWNamespace::isCapitalized( $ns ) ? 'first-letter' : 'case-sensitive',
+                                       ), $title ) . "\n";
                }
                $spaces .= "    </namespaces>";
                return $spaces;
@@ -444,7 +448,7 @@ class XmlDumpWriter {
                if( $row->page_is_redirect ) {
                        $out .= '    ' . Xml::element( 'redirect', array() ) . "\n";
                }
-               if( '' != $row->page_restrictions ) {
+               if( $row->page_restrictions != '' ) {
                        $out .= '    ' . Xml::element( 'restrictions', array(),
                                strval( $row->page_restrictions ) ) . "\n";
                }
@@ -472,8 +476,7 @@ class XmlDumpWriter {
         * @access private
         */
        function writeRevision( $row ) {
-               $fname = 'WikiExporter::dumpRev';
-               wfProfileIn( $fname );
+               wfProfileIn( __METHOD__ );
 
                $out  = "    <revision>\n";
                $out .= "      " . Xml::element( 'id', null, strval( $row->rev_id ) ) . "\n";
@@ -495,6 +498,7 @@ class XmlDumpWriter {
                        $out .= "      " . Xml::elementClean( 'comment', null, strval( $row->rev_comment ) ) . "\n";
                }
 
+               $text = '';
                if( $row->rev_deleted & Revision::DELETED_TEXT ) {
                        $out .= "      " . Xml::element( 'text', array( 'deleted' => 'deleted' ) ) . "\n";
                } elseif( isset( $row->old_text ) ) {
@@ -509,12 +513,12 @@ class XmlDumpWriter {
                                array( 'id' => $row->rev_text_id ),
                                "" ) . "\n";
                }
-               
+
                wfRunHooks( 'XmlDumpWriterWriteRevision', array( &$this, &$out, $row, $text ) );
 
                $out .= "    </revision>\n";
 
-               wfProfileOut( $fname );
+               wfProfileOut( __METHOD__ );
                return $out;
        }
        
@@ -527,8 +531,7 @@ class XmlDumpWriter {
         * @access private
         */
        function writeLogItem( $row ) {
-               $fname = 'WikiExporter::writeLogItem';
-               wfProfileIn( $fname );
+               wfProfileIn( __METHOD__ );
 
                $out  = "    <logitem>\n";
                $out .= "      " . Xml::element( 'id', null, strval( $row->log_id ) ) . "\n";
@@ -562,7 +565,7 @@ class XmlDumpWriter {
 
                $out .= "    </logitem>\n";
 
-               wfProfileOut( $fname );
+               wfProfileOut( __METHOD__ );
                return $out;
        }
 
@@ -913,8 +916,7 @@ class DumpMultiWriter {
 }
 
 function xmlsafe( $string ) {
-       $fname = 'xmlsafe';
-       wfProfileIn( $fname );
+       wfProfileIn( __FUNCTION__ );
 
        /**
         * The page may contain old data which has not been properly normalized.
@@ -924,6 +926,6 @@ function xmlsafe( $string ) {
        $string = UtfNormal::cleanUp( $string );
 
        $string = htmlspecialchars( $string );
-       wfProfileOut( $fname );
+       wfProfileOut( __FUNCTION__ );
        return $string;
 }