Our release manager believes I need to be shot. I am a mindless drone without opinion...

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index b39a8ab..6ab81e5 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -326,20 +326,6 @@ function wfMsg( $key ) {
        return wfMsgReal( $key, $args, true );
 }
 
-/**
- * Get a message in the user interface language and replace wiki
- * links with clickable ones, escaping other HTML
- *
- * @param string $key Message key
- * @return string
- */
-function wfMsgWithLinks( $key ) {
-       global $wgUser;
-       $args = func_get_args();
-       return $wgUser->getSkin()->formatLinksInComment( htmlspecialchars(
-               call_user_func_array( 'wfMsg', $args ) ) );
-}
-
 /**
  * Same as above except doesn't transform the message
  */
@@ -382,19 +368,6 @@ function wfMsgForContent( $key ) {
        return wfMsgReal( $key, $args, true, $forcontent );
 }
 
-/**
- * Get a message in the content language and replace wiki
- * links with clickable ones, escaping other HTML
- *
- * @param string $key Message key
- * @return string
- */
-function wfMsgForContentWithLinks( $key ) {
-       global $wgUser;
-       return $wgUser->getSkin()->formatLinksInComment( htmlspecialchars(
-               call_user_func_array( 'wfMsgForContent', func_get_args() ) ) );
-}
-
 /**
  * Same as above except doesn't transform the message
  */

diff --git a/includes/ProtectionForm.php b/includes/ProtectionForm.php
index d261358..22533ef 100644 (file)
--- a/includes/ProtectionForm.php
+++ b/includes/ProtectionForm.php
@@ -320,7 +320,7 @@ class ProtectionForm {
        function buildExpiryInput() {
                $attribs = array( 'id' => 'expires' ) + $this->disabledAttrib;
                return '<tr>'
-                       . '<td><label for="expires">' . wfMsgWithLinks( 'protectexpiry' ) . '</label></td>'
+                       . '<td><label for="expires">' . wfMsgExt( 'protectexpiry', array( 'parseinline' ) ) . '</label></td>'
                        . '<td>' . Xml::input( 'mwProtect-expiry', 60, $this->mExpiry, $attribs ) . '</td>'
                        . '</tr>';
        }

diff --git a/includes/SpecialWithoutinterwiki.php b/includes/SpecialWithoutinterwiki.php
index ca076a8..8b72ac4 100644 (file)
--- a/includes/SpecialWithoutinterwiki.php
+++ b/includes/SpecialWithoutinterwiki.php
@@ -14,7 +14,7 @@ class WithoutInterwikiPage extends PageQueryPage {
        }
 
        function getPageHeader() {
-               return '<p>' . wfMsgWithLinks( 'withoutinterwiki-header' ) . '</p>';
+               return '<p>' . wfMsgExt( 'withoutinterwiki-header', array( 'parseinline' ) ) . '</p>';
        }
 
        function sortDescending() {