Merge "Restore changes to WikiRevision that were lost in cdeba4cfc7c"

diff --combined includes/import/WikiRevision.php
index 90b048a,7476636..8705bb0
--- 1/includes/import/WikiRevision.php
--- 2/includes/import/WikiRevision.php
+++ b/includes/import/WikiRevision.php
@@@ -463,7 -463,7 +463,7 @@@ class WikiRevision 
                $page = WikiPage::factory( $this->title );
                $page->loadPageData( 'fromdbmaster' );
                if ( !$page->exists() ) {
 -                      # must create the page...
 +                      // must create the page...
                        $pageId = $page->insertOn( $dbw );
                        $created = true;
                        $oldcountable = null;
@@@ -486,21 -486,11 +486,21 @@@
                        }
                }
  
 +              if ( !$pageId ) {
 +                      // This seems to happen if two clients simultaneously try to import the
 +                      // same page
 +                      wfDebug( __METHOD__ . ': got invalid $pageId when importing revision of [[' .
 +                              $this->title->getPrefixedText() . ']], timestamp ' . $this->timestamp . "\n" );
 +                      return false;
 +              }
 +
                // Select previous version to make size diffs correct
 +              // @todo This assumes that multiple revisions of the same page are imported
 +              // in order from oldest to newest.
                $prevId = $dbw->selectField( 'revision', 'rev_id',
                        array(
                                'rev_page' => $pageId,
-                               'rev_timestamp <= ' . $dbw->timestamp( $this->timestamp ),
+                               'rev_timestamp <= ' . $dbw->addQuotes( $dbw->timestamp( $this->timestamp ) ),
                        ),
                        __METHOD__,
                        array( 'ORDER BY' => array(
@@@ -544,6 -534,16 +544,16 @@@
  
        function importLogItem() {
                $dbw = wfGetDB( DB_MASTER );
+ 
+               $user = User::newFromName( $this->getUser() );
+               if ( $user ) {
+                       $userId = intval( $user->getId() );
+                       $userText = $user->getName();
+               } else {
+                       $userId = 0;
+                       $userText = $this->getUser();
+               }
+ 
                # @todo FIXME: This will not record autoblocks
                if ( !$this->getTitle() ) {
                        wfDebug( __METHOD__ . ": skipping invalid {$this->type}/{$this->action} log time, timestamp " .
@@@ -576,8 -576,8 +586,8 @@@
                        'log_type' => $this->type,
                        'log_action' => $this->action,
                        'log_timestamp' => $dbw->timestamp( $this->timestamp ),
-                       'log_user' => User::idFromName( $this->user_text ),
-                       # 'log_user_text' => $this->user_text,
+                       'log_user' => $userId,
+                       'log_user_text' => $userText,
                        'log_namespace' => $this->getTitle()->getNamespace(),
                        'log_title' => $this->getTitle()->getDBkey(),
                        'log_comment' => $this->getComment(),