| Index: trunk/phase3/includes/ProxyTools.php |
| — | — | @@ -181,17 +181,6 @@ |
| 182 | 182 | } |
| 183 | 183 | |
| 184 | 184 | /** |
| 185 | | - * Convert a network specification in CIDR notation to an integer network and a number of bits |
| 186 | | - * |
| 187 | | - * @deprecated Call IP::parseCIDR() directly, will be removed in 1.19 |
| 188 | | - * @return array(string, int) |
| 189 | | - */ |
| 190 | | -function wfParseCIDR( $range ) { |
| 191 | | - wfDeprecated( __FUNCTION__ ); |
| 192 | | - return IP::parseCIDR( $range ); |
| 193 | | -} |
| 194 | | - |
| 195 | | -/** |
| 196 | 185 | * Check if an IP address is in the local proxy list |
| 197 | 186 | * @return bool |
| 198 | 187 | */ |
| Index: trunk/phase3/includes/UserMailer.php |
| — | — | @@ -661,23 +661,3 @@ |
| 662 | 662 | } |
| 663 | 663 | |
| 664 | 664 | } # end of class EmailNotification |
| 665 | | - |
| 666 | | -/**@{ |
| 667 | | - * Backwards compatibility functions |
| 668 | | - * |
| 669 | | - * @deprecated Use UserMailer method deprecated in 1.18, remove in 1.19. |
| 670 | | - */ |
| 671 | | -function wfRFC822Phrase( $s ) { |
| 672 | | - wfDeprecated( __FUNCTION__ ); |
| 673 | | - return UserMailer::rfc822Phrase( $s ); |
| 674 | | -} |
| 675 | | - |
| 676 | | -/** |
| 677 | | - * @deprecated Use UserMailer method deprecated in 1.18, remove in 1.19. |
| 678 | | - */ |
| 679 | | -function userMailer( $to, $from, $subject, $body, $replyto = null ) { |
| 680 | | - wfDeprecated( __FUNCTION__ ); |
| 681 | | - return UserMailer::send( $to, $from, $subject, $body, $replyto ); |
| 682 | | -} |
| 683 | | - |
| 684 | | -/**@}*/ |