Followup r74392. Also cache result of getUser call (may be called twice)

diff --git a/includes/api/ApiQueryRevisions.php b/includes/api/ApiQueryRevisions.php
index a8f83a2..c495d3b 100644 (file)
--- a/includes/api/ApiQueryRevisions.php
+++ b/includes/api/ApiQueryRevisions.php
@@ -376,13 +376,14 @@ class ApiQueryRevisions extends ApiQueryBase {
                                if ( $this->fld_user ) {
                                        $vals['user'] = $revision->getUserText();
                                }
-                               if ( $this->fld_userid ) {
-                                       $user = User::newFromName( $revision->getUserText() );
-                                       $vals['userid'] = $user->getId();
-                               }
-                               if ( !$revision->getUser() ) {
+                               $userid = $revision->getUser();
+                               if ( !$userid ) {
                                        $vals['anon'] = '';
                                }
+
+                               if ( $this->fld_userid ) {
+                                       $vals['userid'] = $userid;
+                               }
                        }
                }