From: Rob Church <robchurch@users.mediawiki.org>
Date: Tue, 19 Jun 2007 14:42:46 +0000 (+0000)
Subject: Our release manager believes I need to be shot. I am a mindless drone without opinion... 
X-Git-Tag: 1.31.0-rc.0~52500
X-Git-Url: http://git.cyclocoop.org/%22%20%20.%20generer_url_ecrire%28%22mots_tous%22%29%20.%20%22?a=commitdiff_plain;h=4d09760870cd3fa4639632902b0eb8e9900f709c;p=lhc%2Fweb%2Fwiklou.git

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

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index b39a8abeae..6ab81e509e 100644
--- 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 d261358e5b..22533ef2a9 100644
--- 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 ca076a8ad3..8b72ac4c42 100644
--- 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() {