Removed more functions marked for removal in 1.19: wfParseCIDR(), wfRFC822Phrase...

diff --git a/includes/ProxyTools.php b/includes/ProxyTools.php
index c45caf0..3d4bb88 100644 (file)
--- a/includes/ProxyTools.php
+++ b/includes/ProxyTools.php
@@ -180,17 +180,6 @@ function wfProxyCheck() {
        }
 }
 
-/**
- * Convert a network specification in CIDR notation to an integer network and a number of bits
- *
- * @deprecated Call IP::parseCIDR() directly, will be removed in 1.19
- * @return array(string, int)
- */
-function wfParseCIDR( $range ) {
-       wfDeprecated( __FUNCTION__ );
-       return IP::parseCIDR( $range );
-}
-
 /**
  * Check if an IP address is in the local proxy list
  * @return bool

diff --git a/includes/UserMailer.php b/includes/UserMailer.php
index 31ff18b..cca9c59 100644 (file)
--- a/includes/UserMailer.php
+++ b/includes/UserMailer.php
@@ -661,23 +661,3 @@ class EmailNotification {
        }
 
 } # end of class EmailNotification
-
-/**@{
- * Backwards compatibility functions
- *
- * @deprecated Use UserMailer method deprecated in 1.18, remove in 1.19.
- */
-function wfRFC822Phrase( $s ) {
-       wfDeprecated( __FUNCTION__ );
-       return UserMailer::rfc822Phrase( $s );
-}
-
-/**
- * @deprecated Use UserMailer method deprecated in 1.18, remove in 1.19.
- */
-function userMailer( $to, $from, $subject, $body, $replyto = null ) {
-       wfDeprecated( __FUNCTION__ );
-       return UserMailer::send( $to, $from, $subject, $body, $replyto );
-}
-
-/**@}*/