| Index: trunk/phase3/includes/LinkFilter.php |
| — | — | @@ -42,42 +42,6 @@ |
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | /** |
| 46 | | - * Make a string to go after an SQL LIKE, which will match the specified |
| 47 | | - * string. There are several kinds of filter entry: |
| 48 | | - * *.domain.com - Produces http://com.domain.%, matches domain.com |
| 49 | | - * and www.domain.com |
| 50 | | - * domain.com - Produces http://com.domain./%, matches domain.com |
| 51 | | - * or domain.com/ but not www.domain.com |
| 52 | | - * *.domain.com/x - Produces http://com.domain.%/x%, matches |
| 53 | | - * www.domain.com/xy |
| 54 | | - * domain.com/x - Produces http://com.domain./x%, matches |
| 55 | | - * domain.com/xy but not www.domain.com/xy |
| 56 | | - * |
| 57 | | - * Asterisks in any other location are considered invalid. |
| 58 | | - * |
| 59 | | - * @param $filterEntry String: domainparts |
| 60 | | - * @param $prot String: protocol |
| 61 | | - * @return String |
| 62 | | - * @deprecated Use makeLikeArray() and pass result to Database::buildLike() instead |
| 63 | | - */ |
| 64 | | - public static function makeLike( $filterEntry , $prot = 'http://' ) { |
| 65 | | - wfDeprecated( __METHOD__ ); |
| 66 | | - |
| 67 | | - $like = self::makeLikeArray( $filterEntry , $prot ); |
| 68 | | - if ( !$like ) { |
| 69 | | - return false; |
| 70 | | - } |
| 71 | | - $dbw = wfGetDB( DB_MASTER ); |
| 72 | | - $s = $dbw->buildLike( $like ); |
| 73 | | - $m = false; |
| 74 | | - if ( preg_match( "/^ *LIKE '(.*)' *$/", $s, $m ) ) { |
| 75 | | - return $m[1]; |
| 76 | | - } else { |
| 77 | | - throw new MWException( __METHOD__.': this DBMS is not supported by this function.' ); |
| 78 | | - } |
| 79 | | - } |
| 80 | | - |
| 81 | | - /** |
| 82 | 46 | * Make an array to be used for calls to DatabaseBase::buildLike(), which |
| 83 | 47 | * will match the specified string. There are several kinds of filter entry: |
| 84 | 48 | * *.domain.com - Produces http://com.domain.%, matches domain.com |
| Index: trunk/phase3/includes/Article.php |
| — | — | @@ -605,7 +605,7 @@ |
| 606 | 606 | |
| 607 | 607 | /** |
| 608 | 608 | * Read/write accessor to select FOR UPDATE |
| 609 | | - * @FIXME: remove, does nothing |
| | 609 | + * @deprecated since 1.18 |
| 610 | 610 | * |
| 611 | 611 | * @param $x Mixed: FIXME |
| 612 | 612 | * @return mixed value of $x, or value stored in Article::mForUpdate |
| Index: trunk/phase3/includes/Linker.php |
| — | — | @@ -19,7 +19,7 @@ |
| 20 | 20 | * |
| 21 | 21 | * @param $class String: the contents of the class attribute; if an empty |
| 22 | 22 | * string is passed, which is the default value, defaults to 'external'. |
| 23 | | - * @deprecated Just pass the external class directly to something using Html::expandAttributes |
| | 23 | + * @deprecated since 1.18 Just pass the external class directly to something using Html::expandAttributes |
| 24 | 24 | */ |
| 25 | 25 | static function getExternalLinkAttributes( $class = 'external' ) { |
| 26 | 26 | wfDeprecated( __METHOD__ ); |
| — | — | @@ -1817,30 +1817,6 @@ |
| 1818 | 1818 | /** |
| 1819 | 1819 | * @deprecated since 1.16 Use link() |
| 1820 | 1820 | * |
| 1821 | | - * This function is a shortcut to makeStubLinkObj(Title::newFromText($title),...). Do not call |
| 1822 | | - * it if you already have a title object handy. See makeStubLinkObj for further documentation. |
| 1823 | | - * |
| 1824 | | - * @param $title String: the text of the title |
| 1825 | | - * @param $text String: link text |
| 1826 | | - * @param $query String: optional query part |
| 1827 | | - * @param $trail String: optional trail. Alphabetic characters at the start of this string will |
| 1828 | | - * be included in the link text. Other characters will be appended after |
| 1829 | | - * the end of the link. |
| 1830 | | - */ |
| 1831 | | - static function makeStubLink( $title, $text = '', $query = '', $trail = '' ) { |
| 1832 | | - wfDeprecated( __METHOD__ ); |
| 1833 | | - $nt = Title::newFromText( $title ); |
| 1834 | | - if ( $nt instanceof Title ) { |
| 1835 | | - return self::makeStubLinkObj( $nt, $text, $query, $trail ); |
| 1836 | | - } else { |
| 1837 | | - wfDebug( 'Invalid title passed to self::makeStubLink(): "' . $title . "\"\n" ); |
| 1838 | | - return $text == '' ? $title : $text; |
| 1839 | | - } |
| 1840 | | - } |
| 1841 | | - |
| 1842 | | - /** |
| 1843 | | - * @deprecated since 1.16 Use link() |
| 1844 | | - * |
| 1845 | 1821 | * Make a link for a title which may or may not be in the database. If you need to |
| 1846 | 1822 | * call this lots of times, pre-fill the link cache with a LinkBatch, otherwise each |
| 1847 | 1823 | * call to this will result in a DB query. |
| — | — | @@ -1855,6 +1831,7 @@ |
| 1856 | 1832 | * @param $prefix String: optional prefix. As trail, only before instead of after. |
| 1857 | 1833 | */ |
| 1858 | 1834 | static function makeLinkObj( $nt, $text = '', $query = '', $trail = '', $prefix = '' ) { |
| | 1835 | + wfDeprecated( __METHOD__ ); |
| 1859 | 1836 | wfProfileIn( __METHOD__ ); |
| 1860 | 1837 | $query = wfCgiToArray( $query ); |
| 1861 | 1838 | list( $inside, $trail ) = self::splitTrail( $trail ); |
| Index: trunk/phase3/includes/LogEventsList.php |
| — | — | @@ -1064,6 +1064,8 @@ |
| 1065 | 1065 | |
| 1066 | 1066 | /** |
| 1067 | 1067 | * @param $request WebRequest: for internal use use a FauxRequest object to pass arbitrary parameters. |
| | 1068 | + * |
| | 1069 | + * @deprecated since 1.14 |
| 1068 | 1070 | */ |
| 1069 | 1071 | function __construct( $request ) { |
| 1070 | 1072 | global $wgUser, $wgOut; |
| — | — | @@ -1112,6 +1114,8 @@ |
| 1113 | 1115 | * @param &$reader LogReader: where to get our data from |
| 1114 | 1116 | * @param $flags Integer: Bitwise combination of flags: |
| 1115 | 1117 | * LogEventsList::NO_ACTION_LINK Don't show restore/unblock/block links |
| | 1118 | + * |
| | 1119 | + * @deprecated since 1.14 |
| 1116 | 1120 | */ |
| 1117 | 1121 | function __construct( &$reader, $flags = 0 ) { |
| 1118 | 1122 | wfDeprecated(__METHOD__); |