followup to r103448, tighten up code

diff --git a/includes/Export.php b/includes/Export.php
index 4521434..dec604e 100644 (file)
--- a/includes/Export.php
+++ b/includes/Export.php
@@ -614,17 +614,11 @@ class XmlDumpWriter {
 
        function writeContributor( $id, $text ) {
                $out = "      <contributor>\n";
-               if ( $id ) {
+               if ( $id || !IP::isValid( $text ) ) {
                        $out .= "        " . Xml::elementClean( 'username', null, strval( $text ) ) . "\n";
                        $out .= "        " . Xml::element( 'id', null, strval( $id ) ) . "\n";
                } else {
-                       if ( IP::isValid( $text ) ) {
-                               $out .= "        " . Xml::elementClean( 'ip', null, strval( $text ) ) . "\n";
-                       }
-                       else {
-                               $out .= "        " . Xml::elementClean( 'username', null, strval( $text ) ) . "\n";
-                               $out .= "        " . Xml::element( 'id', null, strval( $id ) ) . "\n";
-                       }
+                       $out .= "        " . Xml::elementClean( 'ip', null, strval( $text ) ) . "\n";
                }
                $out .= "      </contributor>\n";
                return $out;