log dump tweak: only select user_name from user table

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

diff --git a/includes/Export.php b/includes/Export.php
index 5f040b1..faa11f0 100644 (file)
--- a/includes/Export.php
+++ b/includes/Export.php
@@ -184,8 +184,10 @@ class WikiExporter {
                        # Hide private logs
                        $where[] = LogEventsList::getExcludeClause( $this->db );
                        if( $cond ) $where[] = $cond;
+                       # Get logging table name for logging.* clause
+                       $logging = $this->db->tableName('logging');
                        $result = $this->db->select( array('logging','user'), 
-                               '*',
+                               array( "{$logging}.*", 'user_name' ), // grab the user name
                                $where,
                                $fname,
                                array( 'ORDER BY' => 'log_id', 'USE INDEX' => array('logging' => 'PRIMARY') )
@@ -399,7 +401,7 @@ class XmlDumpWriter {
 
        function namespaces() {
                global $wgContLang;
-               $spaces = "  <namespaces>\n";
+               $spaces = "<namespaces>\n";
                foreach( $wgContLang->getFormattedNamespaces() as $ns => $title ) {
                        $spaces .= '      ' . Xml::element( 'namespace', array( 'key' => $ns ), $title ) . "\n";
                }