From: Sam Reed <reedy@users.mediawiki.org>
Date: Fri, 6 May 2011 20:50:16 +0000 (+0000)
Subject: Couple more deprecated things removed
X-Git-Tag: 1.31.0-rc.0~30371
X-Git-Url: http://git.cyclocoop.org/data/%24self?a=commitdiff_plain;h=5203c8dabcf9b3650bcd3b8c877fde298556d6dd;p=lhc%2Fweb%2Fwiklou.git

Couple more deprecated things removed
---

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index caa42f9ba5..eef53752ee 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -2209,20 +2209,6 @@ function wfPercent( $nr, $acc = 2, $round = true ) {
 	return $round ? round( $ret, $acc ) . '%' : "$ret%";
 }
 
-/**
- * Encrypt a username/password.
- *
- * @param $userid Integer: ID of the user
- * @param $password String: password of the user
- * @return String: hashed password
- * @deprecated since 1.13 Use User::crypt() or User::oldCrypt() instead
- */
-function wfEncryptPassword( $userid, $password ) {
-	wfDeprecated(__FUNCTION__);
-	# Just wrap around User::oldCrypt()
-	return User::oldCrypt( $password, $userid );
-}
-
 /**
  * Appends to second array if $value differs from that in $default
  *
diff --git a/includes/Linker.php b/includes/Linker.php
index 61d8b83850..19b7dd0c16 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -1974,12 +1974,6 @@ class Linker {
 		return self::makeKnownLinkObj( $nt, $text, $query, $trail, $prefix, '', $style );
 	}
 
-	/** Obsolete alias */
-	static function makeImage( $url, $alt = '' ) {
-		wfDeprecated( __METHOD__ );
-		return self::makeExternalImage( $url, $alt );
-	}
-
 	/**
 	 * Creates the HTML source for images
 	 * @deprecated since 1.16 use makeImageLink2