Index: trunk/phase3/skins/Vector.php |
— | — | @@ -111,7 +111,7 @@ |
112 | 112 | Linker::tooltip( $xmlID ); |
113 | 113 | } else { |
114 | 114 | $nav[$section][$key]['key'] = |
115 | | - Linker::tooltipAndAccesskey( $xmlID ); |
| 115 | + Linker::tooltipAndAccesskeyAttribs( $xmlID ); |
116 | 116 | } |
117 | 117 | } |
118 | 118 | } |
— | — | @@ -216,7 +216,7 @@ |
217 | 217 | <!-- panel --> |
218 | 218 | <div id="mw-panel" class="noprint"> |
219 | 219 | <!-- logo --> |
220 | | - <div id="p-logo"><a style="background-image: url(<?php $this->text( 'logopath' ) ?>);" href="<?php echo htmlspecialchars( $this->data['nav_urls']['mainpage']['href'] ) ?>" <?php echo Linker::tooltipAndAccesskey( 'p-logo' ) ?>></a></div> |
| 220 | + <div id="p-logo"><a style="background-image: url(<?php $this->text( 'logopath' ) ?>);" href="<?php echo htmlspecialchars( $this->data['nav_urls']['mainpage']['href'] ) ?>" <?php echo Linker::tooltipAndAccesskeyAttribs( 'p-logo' ) ?>></a></div> |
221 | 221 | <!-- /logo --> |
222 | 222 | <?php $this->renderPortals( $this->data['sidebar'] ); ?> |
223 | 223 | </div> |
Index: trunk/phase3/includes/Xml.php |
— | — | @@ -417,7 +417,7 @@ |
418 | 418 | } |
419 | 419 | |
420 | 420 | /** |
421 | | - * @deprecated Synonymous to Html::hidden() |
| 421 | + * @deprecated since 1.16 Synonymous to Html::hidden() |
422 | 422 | */ |
423 | 423 | public static function hidden( $name, $value, $attribs = array() ) { |
424 | 424 | return Html::hidden( $name, $value, $attribs ); |
Index: trunk/phase3/includes/CategoryPage.php |
— | — | @@ -230,7 +230,7 @@ |
231 | 231 | |
232 | 232 | /** |
233 | 233 | * Add a subcategory to the internal lists, using a title object |
234 | | - * @deprecated kept for compatibility, please use addSubcategoryObject instead |
| 234 | + * @deprecated since 1.17 kept for compatibility, please use addSubcategoryObject instead |
235 | 235 | */ |
236 | 236 | function addSubcategory( Title $title, $sortkey, $pageLength ) { |
237 | 237 | $this->addSubcategoryObject( Category::newFromTitle( $title ), $sortkey, $pageLength ); |
Index: trunk/phase3/includes/search/SearchEngine.php |
— | — | @@ -64,7 +64,7 @@ |
65 | 65 | |
66 | 66 | /** |
67 | 67 | * If this search backend can list/unlist redirects |
68 | | - * @deprecated Call supports( 'list-redirects' ); |
| 68 | + * @deprecated since 1.19 Call supports( 'list-redirects' ); |
69 | 69 | */ |
70 | 70 | function acceptListRedirects() { |
71 | 71 | return $this->supports( 'list-redirects' ); |
Index: trunk/phase3/includes/Article.php |
— | — | @@ -326,23 +326,6 @@ |
327 | 327 | } |
328 | 328 | |
329 | 329 | /** |
330 | | - * This function returns the text of a section, specified by a number ($section). |
331 | | - * A section is text under a heading like == Heading == or \<h1\>Heading\</h1\>, or |
332 | | - * the first section before any such heading (section 0). |
333 | | - * |
334 | | - * If a section contains subsections, these are also returned. |
335 | | - * |
336 | | - * @param $text String: text to look in |
337 | | - * @param $section Integer: section number |
338 | | - * @return string text of the requested section |
339 | | - * @deprecated |
340 | | - */ |
341 | | - public function getSection( $text, $section ) { |
342 | | - global $wgParser; |
343 | | - return $wgParser->getSection( $text, $section ); |
344 | | - } |
345 | | - |
346 | | - /** |
347 | 330 | * Get the text that needs to be saved in order to undo all revisions |
348 | 331 | * between $undo and $undoafter. Revisions must belong to the same page, |
349 | 332 | * must exist and must not be deleted |
Index: trunk/phase3/includes/GlobalFunctions.php |
— | — | @@ -2849,7 +2849,7 @@ |
2850 | 2850 | * |
2851 | 2851 | * @param $name String |
2852 | 2852 | * @param $p Array: parameters |
2853 | | - * @deprecated |
| 2853 | + * @deprecated since 1.18 |
2854 | 2854 | */ |
2855 | 2855 | function wfCreateObject( $name, $p ) { |
2856 | 2856 | return MWFunction::newObj( $name, $p ); |
Index: trunk/phase3/includes/objectcache/EmptyBagOStuff.php |
— | — | @@ -21,7 +21,7 @@ |
22 | 22 | |
23 | 23 | /** |
24 | 24 | * Backwards compatibility alias for EmptyBagOStuff |
25 | | - * @deprecated |
| 25 | + * @deprecated since 1.18 |
26 | 26 | */ |
27 | 27 | class FakeMemCachedClient extends EmptyBagOStuff { |
28 | 28 | } |
Index: trunk/phase3/includes/parser/Parser.php |
— | — | @@ -753,41 +753,6 @@ |
754 | 754 | } |
755 | 755 | |
756 | 756 | /** |
757 | | - * @deprecated use replaceVariables |
758 | | - */ |
759 | | - function strip( $text, $state, $stripcomments = false , $dontstrip = array() ) { |
760 | | - return $text; |
761 | | - } |
762 | | - |
763 | | - /** |
764 | | - * Restores pre, math, and other extensions removed by strip() |
765 | | - * |
766 | | - * always call unstripNoWiki() after this one |
767 | | - * @private |
768 | | - * @deprecated use $this->mStripState->unstrip() |
769 | | - */ |
770 | | - function unstrip( $text, $state ) { |
771 | | - return $state->unstripGeneral( $text ); |
772 | | - } |
773 | | - |
774 | | - /** |
775 | | - * Always call this after unstrip() to preserve the order |
776 | | - * |
777 | | - * @private |
778 | | - * @deprecated use $this->mStripState->unstrip() |
779 | | - */ |
780 | | - function unstripNoWiki( $text, $state ) { |
781 | | - return $state->unstripNoWiki( $text ); |
782 | | - } |
783 | | - |
784 | | - /** |
785 | | - * @deprecated use $this->mStripState->unstripBoth() |
786 | | - */ |
787 | | - function unstripForHTML( $text ) { |
788 | | - return $this->mStripState->unstripBoth( $text ); |
789 | | - } |
790 | | - |
791 | | - /** |
792 | 757 | * Add an item to the strip state |
793 | 758 | * Returns the unique tag which must be inserted into the stripped text |
794 | 759 | * The tag will be replaced with the original text in unstrip() |
— | — | @@ -2035,18 +2000,6 @@ |
2036 | 2001 | } |
2037 | 2002 | |
2038 | 2003 | /** |
2039 | | - * Make a link placeholder. The text returned can be later resolved to a real link with |
2040 | | - * replaceLinkHolders(). This is done for two reasons: firstly to avoid further |
2041 | | - * parsing of interwiki links, and secondly to allow all existence checks and |
2042 | | - * article length checks (for stub links) to be bundled into a single query. |
2043 | | - * |
2044 | | - * @deprecated |
2045 | | - */ |
2046 | | - function makeLinkHolder( &$nt, $text = '', $query = array(), $trail = '', $prefix = '' ) { |
2047 | | - return $this->mLinkHolders->makeHolder( $nt, $text, $query, $trail, $prefix ); |
2048 | | - } |
2049 | | - |
2050 | | - /** |
2051 | 2004 | * Render a forced-blue link inline; protect against double expansion of |
2052 | 2005 | * URLs if we're in a mode that prepends full URL prefixes to internal links. |
2053 | 2006 | * Since this little disaster has to split off the trail text to avoid |
Index: trunk/phase3/includes/Linker.php |
— | — | @@ -1990,12 +1990,6 @@ |
1991 | 1991 | return self::makeImageLink2( $title, $file, $frameParams, $handlerParams, $time ); |
1992 | 1992 | } |
1993 | 1993 | |
1994 | | - /** @deprecated use Linker::makeMediaLinkObj() */ |
1995 | | - static function makeMediaLink( $name, $unused = '', $text = '', $time = false ) { |
1996 | | - $nt = Title::makeTitleSafe( NS_FILE, $name ); |
1997 | | - return self::makeMediaLinkObj( $nt, $text, $time ); |
1998 | | - } |
1999 | | - |
2000 | 1994 | /** |
2001 | 1995 | * Returns the attributes for the tooltip and access key. |
2002 | 1996 | */ |
— | — | @@ -2021,14 +2015,6 @@ |
2022 | 2016 | |
2023 | 2017 | /** |
2024 | 2018 | * @deprecated since 1.14 |
2025 | | - * Returns raw bits of HTML, use titleAttrib() and accesskey() |
2026 | | - */ |
2027 | | - public static function tooltipAndAccesskey( $name ) { |
2028 | | - return Xml::expandAttributes( self::tooltipAndAccesskeyAttribs( $name ) ); |
2029 | | - } |
2030 | | - |
2031 | | - /** |
2032 | | - * @deprecated since 1.14 |
2033 | 2019 | * Returns raw bits of HTML, use titleAttrib() |
2034 | 2020 | */ |
2035 | 2021 | public static function tooltip( $name, $options = null ) { |
Index: trunk/phase3/includes/filerepo/LocalFile.php |
— | — | @@ -842,28 +842,7 @@ |
843 | 843 | |
844 | 844 | /** |
845 | 845 | * Record a file upload in the upload log and the image table |
846 | | - * @deprecated use upload() |
847 | 846 | */ |
848 | | - function recordUpload( $oldver, $desc, $license = '', $copyStatus = '', $source = '', |
849 | | - $watch = false, $timestamp = false ) |
850 | | - { |
851 | | - $pageText = SpecialUpload::getInitialPageText( $desc, $license, $copyStatus, $source ); |
852 | | - |
853 | | - if ( !$this->recordUpload2( $oldver, $desc, $pageText ) ) { |
854 | | - return false; |
855 | | - } |
856 | | - |
857 | | - if ( $watch ) { |
858 | | - global $wgUser; |
859 | | - $wgUser->addWatch( $this->getTitle() ); |
860 | | - } |
861 | | - return true; |
862 | | - |
863 | | - } |
864 | | - |
865 | | - /** |
866 | | - * Record a file upload in the upload log and the image table |
867 | | - */ |
868 | 847 | function recordUpload2( |
869 | 848 | $oldver, $comment, $pageText, $props = false, $timestamp = false, $user = null |
870 | 849 | ) { |
Index: trunk/phase3/includes/EditPage.php |
— | — | @@ -2127,7 +2127,7 @@ |
2128 | 2128 | * Produce the stock "your edit contains spam" page |
2129 | 2129 | * |
2130 | 2130 | * @param $match Text which triggered one or more filters |
2131 | | - * @deprecated Use method spamPageWithContent() instead |
| 2131 | + * @deprecated since 1.17 Use method spamPageWithContent() instead |
2132 | 2132 | */ |
2133 | 2133 | static function spamPage( $match = false ) { |
2134 | 2134 | global $wgOut, $wgTitle; |
— | — | @@ -2237,14 +2237,6 @@ |
2238 | 2238 | } |
2239 | 2239 | |
2240 | 2240 | /** |
2241 | | - * @deprecated use $wgParser->stripSectionName() |
2242 | | - */ |
2243 | | - function pseudoParseSectionAnchor( $text ) { |
2244 | | - global $wgParser; |
2245 | | - return $wgParser->stripSectionName( $text ); |
2246 | | - } |
2247 | | - |
2248 | | - /** |
2249 | 2241 | * Format an anchor fragment as it would appear for a given section name |
2250 | 2242 | * @param $text String |
2251 | 2243 | * @return String |
Index: trunk/phase3/includes/LogEventsList.php |
— | — | @@ -1056,7 +1056,7 @@ |
1057 | 1057 | } |
1058 | 1058 | |
1059 | 1059 | /** |
1060 | | - * @deprecated |
| 1060 | + * @deprecated since 1.14 |
1061 | 1061 | * @ingroup SpecialPage |
1062 | 1062 | */ |
1063 | 1063 | class LogReader { |
— | — | @@ -1099,7 +1099,7 @@ |
1100 | 1100 | } |
1101 | 1101 | |
1102 | 1102 | /** |
1103 | | - * @deprecated |
| 1103 | + * @deprecated since 1.14 |
1104 | 1104 | * @ingroup SpecialPage |
1105 | 1105 | */ |
1106 | 1106 | class LogViewer { |
Index: trunk/phase3/includes/api/ApiMain.php |
— | — | @@ -278,7 +278,7 @@ |
279 | 279 | } |
280 | 280 | |
281 | 281 | /** |
282 | | - * @deprecated Private caching is now the default, so there is usually no |
| 282 | + * @deprecated since 1.17 Private caching is now the default, so there is usually no |
283 | 283 | * need to call this function. If there is a need, you can use |
284 | 284 | * $this->setCacheMode('private') |
285 | 285 | */ |
— | — | @@ -306,7 +306,7 @@ |
307 | 307 | * given URL must either always or never call this function; if it sometimes does and |
308 | 308 | * sometimes doesn't, stuff will break. |
309 | 309 | * |
310 | | - * @deprecated Use setCacheMode( 'anon-public-user-private' ) |
| 310 | + * @deprecated since 1.17 Use setCacheMode( 'anon-public-user-private' ) |
311 | 311 | */ |
312 | 312 | public function setVaryCookie() { |
313 | 313 | $this->setCacheMode( 'anon-public-user-private' ); |
Index: trunk/phase3/includes/api/ApiBase.php |
— | — | @@ -585,7 +585,7 @@ |
586 | 586 | } |
587 | 587 | |
588 | 588 | /** |
589 | | - * @deprecated use MWNamespace::getValidNamespaces() |
| 589 | + * @deprecated since 1.17 use MWNamespace::getValidNamespaces() |
590 | 590 | */ |
591 | 591 | public static function getValidNamespaces() { |
592 | 592 | return MWNamespace::getValidNamespaces(); |
Index: trunk/phase3/includes/WebRequest.php |
— | — | @@ -633,7 +633,7 @@ |
634 | 634 | /** |
635 | 635 | * Return the size of the upload, or 0. |
636 | 636 | * |
637 | | - * @deprecated |
| 637 | + * @deprecated since 1.17 |
638 | 638 | * @param $key String: |
639 | 639 | * @return integer |
640 | 640 | */ |
Index: trunk/phase3/includes/cache/HTMLCacheUpdate.php |
— | — | @@ -155,7 +155,7 @@ |
156 | 156 | |
157 | 157 | /** |
158 | 158 | * Invalidate a range of pages, right now |
159 | | - * @deprecated |
| 159 | + * @deprecated since 1.16 |
160 | 160 | */ |
161 | 161 | public function invalidate( $startId = false, $endId = false ) { |
162 | 162 | $titleArray = $this->mCache->getLinks( $this->mTable, $startId, $endId ); |
Index: trunk/phase3/includes/Title.php |
— | — | @@ -5,12 +5,6 @@ |
6 | 6 | */ |
7 | 7 | |
8 | 8 | /** |
9 | | - * @deprecated This used to be a define, but was moved to |
10 | | - * Title::GAID_FOR_UPDATE in 1.17. This will probably be removed in 1.18 |
11 | | - */ |
12 | | -define( 'GAID_FOR_UPDATE', Title::GAID_FOR_UPDATE ); |
13 | | - |
14 | | -/** |
15 | 9 | * Represents a title within MediaWiki. |
16 | 10 | * Optionally may contain an interwiki designation or namespace. |
17 | 11 | * @note This class can fetch various kinds of data from the database; |
Index: trunk/phase3/includes/DefaultSettings.php |
— | — | @@ -284,7 +284,7 @@ |
285 | 285 | $wgIllegalFileChars = ":"; |
286 | 286 | |
287 | 287 | /** |
288 | | - * @deprecated use $wgDeletedDirectory |
| 288 | + * @deprecated since 1.17 use $wgDeletedDirectory |
289 | 289 | */ |
290 | 290 | $wgFileStore = array(); |
291 | 291 | |
— | — | @@ -3599,7 +3599,7 @@ |
3600 | 3600 | * - true : block it |
3601 | 3601 | * - false : let it through |
3602 | 3602 | * |
3603 | | - * @deprecated Use hooks. See SpamBlacklist extension. |
| 3603 | + * @deprecated since 1.17 Use hooks. See SpamBlacklist extension. |
3604 | 3604 | */ |
3605 | 3605 | $wgFilterCallback = false; |
3606 | 3606 | |
— | — | @@ -3610,7 +3610,7 @@ |
3611 | 3611 | $wgEnableDnsBlacklist = false; |
3612 | 3612 | |
3613 | 3613 | /** |
3614 | | - * @deprecated Use $wgEnableDnsBlacklist instead, only kept for backward |
| 3614 | + * @deprecated since 1.17 Use $wgEnableDnsBlacklist instead, only kept for backward |
3615 | 3615 | * compatibility |
3616 | 3616 | */ |
3617 | 3617 | $wgEnableSorbs = false; |
— | — | @@ -3622,7 +3622,7 @@ |
3623 | 3623 | $wgDnsBlacklistUrls = array( 'http.dnsbl.sorbs.net.' ); |
3624 | 3624 | |
3625 | 3625 | /** |
3626 | | - * @deprecated Use $wgDnsBlacklistUrls instead, only kept for backward |
| 3626 | + * @deprecated since 1.17 Use $wgDnsBlacklistUrls instead, only kept for backward |
3627 | 3627 | * compatibility |
3628 | 3628 | */ |
3629 | 3629 | $wgSorbsUrl = array(); |
— | — | @@ -3672,7 +3672,7 @@ |
3673 | 3673 | /** |
3674 | 3674 | * Array of groups which should never trigger the rate limiter |
3675 | 3675 | * |
3676 | | - * @deprecated as of 1.13.0, the preferred method is using |
| 3676 | + * @deprecated since 1.13.0, the preferred method is using |
3677 | 3677 | * $wgGroupPermissions[]['noratelimit']. However, this will still |
3678 | 3678 | * work if desired. |
3679 | 3679 | * |
— | — | @@ -4426,7 +4426,7 @@ |
4427 | 4427 | |
4428 | 4428 | /** |
4429 | 4429 | * Set this to some HTML to override the rights icon with an arbitrary logo |
4430 | | - * @deprecated Use $wgFooterIcons['copyright']['copyright'] |
| 4430 | + * @deprecated since 1.18 Use $wgFooterIcons['copyright']['copyright'] |
4431 | 4431 | */ |
4432 | 4432 | $wgCopyrightIcon = null; |
4433 | 4433 | |
— | — | @@ -4544,7 +4544,7 @@ |
4545 | 4545 | |
4546 | 4546 | /** |
4547 | 4547 | * Aliases for special pages provided by extensions. |
4548 | | - * @deprecated Use $specialPageAliases in a file referred to by $wgExtensionMessagesFiles |
| 4548 | + * @deprecated since 1.16 Use $specialPageAliases in a file referred to by $wgExtensionMessagesFiles |
4549 | 4549 | */ |
4550 | 4550 | $wgExtensionAliasesFiles = array(); |
4551 | 4551 | |
Index: trunk/phase3/includes/specials/SpecialUndelete.php |
— | — | @@ -159,19 +159,6 @@ |
160 | 160 | } |
161 | 161 | |
162 | 162 | /** |
163 | | - * Fetch (and decompress if necessary) the stored text for the deleted |
164 | | - * revision of the page with the given timestamp. |
165 | | - * |
166 | | - * @param $timestamp String |
167 | | - * @return String |
168 | | - * @deprecated Use getRevision() for more flexible information |
169 | | - */ |
170 | | - function getRevisionText( $timestamp ) { |
171 | | - $rev = $this->getRevision( $timestamp ); |
172 | | - return $rev ? $rev->getText() : null; |
173 | | - } |
174 | | - |
175 | | - /** |
176 | 163 | * Return a Revision object containing data for the deleted revision. |
177 | 164 | * Note that the result *may* or *may not* have a null page ID. |
178 | 165 | * |
Index: trunk/phase3/includes/specials/SpecialRandompage.php |
— | — | @@ -169,9 +169,9 @@ |
170 | 170 | return $dbr->fetchObject( $res ); |
171 | 171 | } |
172 | 172 | |
173 | | - /* an alternative to $wgExtraRandompageSQL so subclasses |
| 173 | + /** an alternative to $wgExtraRandompageSQL so subclasses |
174 | 174 | * can add their own SQL by overriding this function |
175 | | - * @deprecated, append to $this->extra instead |
| 175 | + * @deprecated since 1.16 append to $this->extra instead |
176 | 176 | */ |
177 | 177 | public function addExtraSQL() { |
178 | 178 | return ''; |
Index: trunk/phase3/includes/Skin.php |
— | — | @@ -376,7 +376,7 @@ |
377 | 377 | * This used to load MediaWiki:Common.js and the skin-specific style |
378 | 378 | * before the ResourceLoader. |
379 | 379 | * |
380 | | - * @deprecated Use the ResourceLoader instead. This may be removed at some |
| 380 | + * @deprecated since 1.18 Use the ResourceLoader instead. This may be removed at some |
381 | 381 | * point. |
382 | 382 | * @param $skinName String: If set, overrides the skin name |
383 | 383 | * @return String |
— | — | @@ -388,7 +388,7 @@ |
389 | 389 | /** |
390 | 390 | * Generate user stylesheet for action=raw&gen=css |
391 | 391 | * |
392 | | - * @deprecated Use the ResourceLoader instead. This may be removed at some |
| 392 | + * @deprecated since 1.18 Use the ResourceLoader instead. This may be removed at some |
393 | 393 | * point. |
394 | 394 | * @return String |
395 | 395 | */ |
Index: trunk/phase3/includes/ImageGallery.php |
— | — | @@ -127,9 +127,10 @@ |
128 | 128 | * Instruct the class to use a specific skin for rendering |
129 | 129 | * |
130 | 130 | * @param $skin Skin object |
131 | | - * @deprecated Not used anymore |
| 131 | + * @deprecated since 1.18 Not used anymore |
132 | 132 | */ |
133 | 133 | function useSkin( $skin ) { |
| 134 | + wfDeprecated( __METHOD__ ); |
134 | 135 | /* no op */ |
135 | 136 | } |
136 | 137 | |
Index: trunk/phase3/languages/LanguageConverter.php |
— | — | @@ -472,7 +472,7 @@ |
473 | 473 | * |
474 | 474 | * @param $text String: the text to be converted |
475 | 475 | * @return Array: variant => converted text |
476 | | - * @deprecated Use autoConvertToAllVariants() instead |
| 476 | + * @deprecated since 1.17 Use autoConvertToAllVariants() instead |
477 | 477 | */ |
478 | 478 | public function convertLinkToAllVariants( $text ) { |
479 | 479 | return $this->autoConvertToAllVariants( $text ); |
Index: trunk/phase3/languages/Language.php |
— | — | @@ -2839,7 +2839,7 @@ |
2840 | 2840 | * into an array of all possible variants of the text: |
2841 | 2841 | * 'variant' => text in that variant |
2842 | 2842 | * |
2843 | | - * @deprecated Use autoConvertToAllVariants() |
| 2843 | + * @deprecated since 1.17 Use autoConvertToAllVariants() |
2844 | 2844 | */ |
2845 | 2845 | function convertLinkToAllVariants( $text ) { |
2846 | 2846 | return $this->mConverter->convertLinkToAllVariants( $text ); |