| Index: trunk/extensions/OpenID/OpenID.hooks.php |
| — | — | @@ -140,14 +140,14 @@ |
| 141 | 141 | foreach ( $urls as $url ) { |
| 142 | 142 | $rows .= Xml::tags( 'tr', array(), |
| 143 | 143 | Xml::tags( 'td', array(), Xml::element( 'a', array( 'href' => $url ), $url ) ) . |
| 144 | | - Xml::tags( 'td', array(), $sk->link( $delTitle, wfMsg( 'openid-urls-delete' ), array(), array( 'url' => $url ) ) ) |
| | 144 | + Xml::tags( 'td', array(), $sk->link( $delTitle, wfMsgHtml( 'openid-urls-delete' ), array(), array( 'url' => $url ) ) ) |
| 145 | 145 | ) . "\n"; |
| 146 | 146 | } |
| 147 | 147 | $info = Xml::tags( 'table', array( 'class' => 'wikitable' ), |
| 148 | 148 | Xml::tags( 'tr', array(), Xml::element( 'th', array(), wfMsg( 'openid-urls-url' ) ) . Xml::element( 'th', array(), wfMsg( 'openid-urls-action' ) ) ) . "\n" . |
| 149 | 149 | $rows |
| 150 | 150 | ); |
| 151 | | - $info .= $user->getSkin()->link( SpecialPage::getTitleFor( 'OpenIDConvert' ), wfMsgHtml( 'openid-add-url' ) ); |
| | 151 | + $info .= $sk->link( SpecialPage::getTitleFor( 'OpenIDConvert' ), wfMsgHtml( 'openid-add-url' ) ); |
| 152 | 152 | return $info; |
| 153 | 153 | } |
| 154 | 154 | |
| — | — | @@ -244,7 +244,7 @@ |
| 245 | 245 | $dbw = wfGetDB( DB_MASTER ); |
| 246 | 246 | |
| 247 | 247 | $dbw->delete( 'user_openid', array( 'uoi_user' => $userID ) ); |
| 248 | | - $wgOut->addHTML( "OpenID " . wfMsg( 'usermerge-userdeleted', $username, $userID ) ); |
| | 248 | + $wgOut->addHTML( "OpenID " . wfMsgHtml( 'usermerge-userdeleted', $username, $userID ) ); |
| 249 | 249 | |
| 250 | 250 | wfDebug( "OpenID: deleted OpenID user $username ($userID)\n" ); |
| 251 | 251 | |
| — | — | @@ -269,13 +269,13 @@ |
| 270 | 270 | $dbw = wfGetDB( DB_MASTER ); |
| 271 | 271 | |
| 272 | 272 | $dbw->update( 'user_openid', array( 'uoi_user' => $toUserID ), array( 'uoi_user' => $fromUserID ) ); |
| 273 | | - $wgOut->addHTML( "OpenID " . wfMsg( 'usermerge-updating', 'user_openid', $fromUsername, $toUsername ) . "<br />\n" ); |
| | 273 | + $wgOut->addHTML( "OpenID " . wfMsgHtml( 'usermerge-updating', 'user_openid', $fromUsername, $toUsername ) . "<br />\n" ); |
| 274 | 274 | |
| 275 | 275 | wfDebug( "OpenID: transferred OpenID(s) of $fromUsername ($fromUserID) => $toUsername ($toUserID)\n" ); |
| 276 | 276 | |
| 277 | 277 | } else { |
| 278 | 278 | |
| 279 | | - $wgOut->addHTML( wfMsg( 'openid-openids-were-not-merged' ) . "<br />\n" ); |
| | 279 | + $wgOut->addHTML( wfMsgHtml( 'openid-openids-were-not-merged' ) . "<br />\n" ); |
| 280 | 280 | wfDebug( "OpenID: OpenID(s) were not merged for merged users $fromUsername ($fromUserID) => $toUsername ($toUserID)\n" ); |
| 281 | 281 | |
| 282 | 282 | } |