Merge "Remove usages of deprecated User::getRights."

diff --combined includes/api/ApiQueryUserInfo.php
index e058e5d,5edf83e..ab8d93a
--- 1/includes/api/ApiQueryUserInfo.php
--- 2/includes/api/ApiQueryUserInfo.php
+++ b/includes/api/ApiQueryUserInfo.php
@@@ -159,8 -159,7 +159,7 @@@ class ApiQueryUserInfo extends ApiQuery
                }
  
                if ( isset( $this->prop['rights'] ) ) {
-                       // User::getRights() may return duplicate values, strip them
-                       $vals['rights'] = array_values( array_unique( $user->getRights() ) );
+                       $vals['rights'] = $this->getPermissionManager()->getUserPermissions( $user );
                        ApiResult::setArrayType( $vals['rights'], 'array' ); // even if empty
                        ApiResult::setIndexedTagName( $vals['rights'], 'r' ); // even if empty
                }
@@@ -180,7 -179,7 +179,7 @@@
  
                if ( isset( $this->prop['preferencestoken'] ) &&
                        !$this->lacksSameOriginSecurity() &&
 -                      $user->isAllowed( 'editmyoptions' )
 +                      $this->getPermissionManager()->userHasRight( $user, 'editmyoptions' )
                ) {
                        $vals['preferencestoken'] = $user->getEditToken( '', $this->getMain()->getRequest() );
                }
@@@ -201,8 -200,7 +200,8 @@@
                        $vals['realname'] = $user->getRealName();
                }
  
 -              if ( $user->isAllowed( 'viewmyprivateinfo' ) && isset( $this->prop['email'] ) ) {
 +              if ( $this->getPermissionManager()->userHasRight( $user, 'viewmyprivateinfo' ) &&
 +                              isset( $this->prop['email'] ) ) {
                        $vals['email'] = $user->getEmail();
                        $auth = $user->getEmailAuthenticationTimestamp();
                        if ( $auth !== null ) {