Merge "Use isDisabled() instead of isBlank() in getGrantName in User.php"

diff --combined includes/user/User.php
index b6a64b0,4950e27..f07db0e
--- 1/includes/user/User.php
--- 2/includes/user/User.php
+++ b/includes/user/User.php
@@@ -5066,28 -5066,16 +5066,29 @@@ class User implements IDBAccessObject 
        /**
         * Get the description of a given right
         *
+        * @since 1.29
         * @param string $right Right to query
         * @return string Localized description of the right
         */
        public static function getRightDescription( $right ) {
                $key = "right-$right";
                $msg = wfMessage( $key );
-               return $msg->isBlank() ? $right : $msg->text();
+               return $msg->isDisabled() ? $right : $msg->text();
        }
  
 +      /**
 +       * Get the name of a given grant
 +       *
 +       * @since 1.29
 +       * @param string $grant Grant to query
 +       * @return string Localized name of the grant
 +       */
 +      public static function getGrantName( $grant ) {
 +              $key = "grant-$grant";
 +              $msg = wfMessage( $key );
 +              return $msg->isDisabled() ? $grant : $msg->text();
 +      }
 +
        /**
         * Make a new-style password hash
         *