| Index: trunk/phase3/includes/User.php |
| — | — | @@ -3610,10 +3610,8 @@ |
| 3611 | 3611 | */ |
| 3612 | 3612 | static function getRightDescription( $right ) { |
| 3613 | 3613 | $key = "right-$right"; |
| 3614 | | - $name = wfMsg( $key ); |
| 3615 | | - return $name == '' || wfEmptyMsg( $key ) |
| 3616 | | - ? $right |
| 3617 | | - : $name; |
| | 3614 | + $msg = wfMessage( $key ); |
| | 3615 | + return $msg->isBlank() ? $right : $msg->text(); |
| 3618 | 3616 | } |
| 3619 | 3617 | |
| 3620 | 3618 | /** |
| Index: trunk/phase3/includes/HTMLForm.php |
| — | — | @@ -973,23 +973,20 @@ |
| 974 | 974 | $helptext = null; |
| 975 | 975 | |
| 976 | 976 | if ( isset( $this->mParams['help-message'] ) ) { |
| 977 | | - $msg = $this->mParams['help-message']; |
| 978 | | - $helptext = wfMsgExt( $msg, 'parseinline' ); |
| 979 | | - if ( wfEmptyMsg( $msg ) ) { |
| 980 | | - # Never mind |
| 981 | | - $helptext = null; |
| | 977 | + $msg = wfMessage( $this->mParams['help-message'] ); |
| | 978 | + if ( $msg->exists() ) { |
| | 979 | + $helptext = $msg->parse(); |
| 982 | 980 | } |
| 983 | 981 | } elseif ( isset( $this->mParams['help-messages'] ) ) { |
| 984 | 982 | # help-message can be passed a message key (string) or an array containing |
| 985 | 983 | # a message key and additional parameters. This makes it impossible to pass |
| 986 | 984 | # an array of message key |
| 987 | | - foreach( $this->mParams['help-messages'] as $msg ) { |
| 988 | | - $candidate = wfMsgExt( $msg, 'parseinline' ); |
| 989 | | - if( wfEmptyMsg( $msg ) ) { |
| 990 | | - $candidate = null; |
| | 985 | + foreach( $this->mParams['help-messages'] as $name ) { |
| | 986 | + $msg = wfMessage( $name ); |
| | 987 | + if( $msg->exists() ) { |
| | 988 | + $helptext .= $msg->parse(); // append message |
| 991 | 989 | } |
| 992 | | - $helptext .= $candidate; // append message |
| 993 | | - } |
| | 990 | + } |
| 994 | 991 | } elseif ( isset( $this->mParams['help'] ) ) { |
| 995 | 992 | $helptext = $this->mParams['help']; |
| 996 | 993 | } |