Index: trunk/phase3/includes/ProxyTools.php |
— | — | @@ -13,6 +13,7 @@ |
14 | 14 | * @return string |
15 | 15 | */ |
16 | 16 | function wfGetForwardedFor() { |
| 17 | + wfDeprecated( __METHOD__, '1.19' ); |
17 | 18 | global $wgRequest; |
18 | 19 | return $wgRequest->getHeader( 'X-Forwarded-For' ); |
19 | 20 | } |
— | — | @@ -25,7 +26,7 @@ |
26 | 27 | * @return string |
27 | 28 | */ |
28 | 29 | function wfGetAgent() { |
29 | | - wfDeprecated( __FUNCTION__ ); |
| 30 | + wfDeprecated( __METHOD__, '1.18' ); |
30 | 31 | global $wgRequest; |
31 | 32 | return $wgRequest->getHeader( 'User-Agent' ); |
32 | 33 | } |
— | — | @@ -38,6 +39,7 @@ |
39 | 40 | * @return string |
40 | 41 | */ |
41 | 42 | function wfGetIP() { |
| 43 | + wfDeprecated( __METHOD__, '1.19' ); |
42 | 44 | global $wgRequest; |
43 | 45 | return $wgRequest->getIP(); |
44 | 46 | } |
Index: trunk/phase3/includes/User.php |
— | — | @@ -730,6 +730,7 @@ |
731 | 731 | * @deprecated since 1.18 call Sanitizer::isValidEmail() directly |
732 | 732 | */ |
733 | 733 | public static function isValidEmailAddr( $addr ) { |
| 734 | + wfDeprecated( __METHOD__, '1.18' ); |
734 | 735 | return Sanitizer::validateEmail( $addr ); |
735 | 736 | } |
736 | 737 | |
— | — | @@ -2593,6 +2594,7 @@ |
2594 | 2595 | * @deprecated since 1.18 Use ->getSkin() in the most relevant outputting context you have |
2595 | 2596 | */ |
2596 | 2597 | public function getSkin() { |
| 2598 | + wfDeprecated( __METHOD__, '1.18' ); |
2597 | 2599 | return RequestContext::getMain()->getSkin(); |
2598 | 2600 | } |
2599 | 2601 | |
— | — | @@ -2725,6 +2727,7 @@ |
2726 | 2728 | * @deprecated in 1.19 due to removal of user_options from the user table |
2727 | 2729 | */ |
2728 | 2730 | private function decodeOptions( $str ) { |
| 2731 | + wfDeprecated( __METHOD__, '1.19' ); |
2729 | 2732 | if( !$str ) |
2730 | 2733 | return; |
2731 | 2734 | |
— | — | @@ -3012,11 +3015,12 @@ |
3013 | 3016 | * @return String Page rendering hash |
3014 | 3017 | */ |
3015 | 3018 | public function getPageRenderingHash() { |
| 3019 | + wfDeprecated( __METHOD__, '1.17' ); |
| 3020 | + |
3016 | 3021 | global $wgUseDynamicDates, $wgRenderHashAppend, $wgLang, $wgContLang; |
3017 | 3022 | if( $this->mHash ){ |
3018 | 3023 | return $this->mHash; |
3019 | 3024 | } |
3020 | | - wfDeprecated( __METHOD__ ); |
3021 | 3025 | |
3022 | 3026 | // stubthreshold is only included below for completeness, |
3023 | 3027 | // since it disables the parser cache, its value will always |
— | — | @@ -3189,6 +3193,7 @@ |
3190 | 3194 | * @return String The new edit token |
3191 | 3195 | */ |
3192 | 3196 | public function editToken( $salt = '', $request = null ) { |
| 3197 | + wfDeprecated( __METHOD__, '1.19' ); |
3193 | 3198 | return $this->getEditToken( $salt, $request ); |
3194 | 3199 | } |
3195 | 3200 | |
Index: trunk/phase3/includes/StubObject.php |
— | — | @@ -118,6 +118,7 @@ |
119 | 119 | class StubContLang extends StubObject { |
120 | 120 | |
121 | 121 | function __construct() { |
| 122 | + wfDeprecated( __CLASS__, '1.18' ); |
122 | 123 | parent::__construct( 'wgContLang' ); |
123 | 124 | } |
124 | 125 | |
Index: trunk/phase3/includes/WebRequest.php |
— | — | @@ -743,6 +743,7 @@ |
744 | 744 | * @return integer |
745 | 745 | */ |
746 | 746 | public function getFileSize( $key ) { |
| 747 | + wfDeprecated( __METHOD__, '1.17' ); |
747 | 748 | $file = new WebRequestUpload( $this, $key ); |
748 | 749 | return $file->getSize(); |
749 | 750 | } |
— | — | @@ -955,6 +956,7 @@ |
956 | 957 | * @return bool |
957 | 958 | */ |
958 | 959 | public function isPathInfoBad( $extWhitelist = array() ) { |
| 960 | + wfDeprecated( __METHOD__, '1.17' ); |
959 | 961 | global $wgScriptExtension; |
960 | 962 | $extWhitelist[] = ltrim( $wgScriptExtension, '.' ); |
961 | 963 | return IEUrlExtension::areServerVarsBad( $_SERVER, $extWhitelist ); |
Index: trunk/phase3/includes/Revision.php |
— | — | @@ -728,7 +728,7 @@ |
729 | 729 | * @return String |
730 | 730 | */ |
731 | 731 | public function revText() { |
732 | | - wfDeprecated( __METHOD__ ); |
| 732 | + wfDeprecated( __METHOD__, '1.17' ); |
733 | 733 | return $this->getText( self::FOR_THIS_USER ); |
734 | 734 | } |
735 | 735 | |
Index: trunk/phase3/includes/Wiki.php |
— | — | @@ -289,6 +289,7 @@ |
290 | 290 | * @return Article object |
291 | 291 | */ |
292 | 292 | public static function articleFromTitle( $title, IContextSource $context ) { |
| 293 | + wfDeprecated( __METHOD__, '1.18' ); |
293 | 294 | return Article::newFromTitle( $title, $context ); |
294 | 295 | } |
295 | 296 | |
Index: trunk/phase3/includes/SkinLegacy.php |
— | — | @@ -532,6 +532,7 @@ |
533 | 533 | * @deprecated in 1.19 |
534 | 534 | */ |
535 | 535 | function getQuickbarCompensator( $rows = 1 ) { |
| 536 | + wfDeprecated( __METHOD__, '1.19' ); |
536 | 537 | return "<td width='152' rowspan='{$rows}'> </td>"; |
537 | 538 | } |
538 | 539 | |
Index: trunk/phase3/includes/Namespace.php |
— | — | @@ -69,6 +69,7 @@ |
70 | 70 | * @deprecated Please use the more consistently named isSubject (since 1.19) |
71 | 71 | */ |
72 | 72 | public static function isMain( $index ) { |
| 73 | + wfDeprecated( __METHOD__, '1.19' ); |
73 | 74 | return self::isSubject( $index ); |
74 | 75 | } |
75 | 76 | |
Index: trunk/phase3/includes/WikiPage.php |
— | — | @@ -2157,6 +2157,7 @@ |
2158 | 2158 | * @deprecated since 1.18, use doEditUpdates() |
2159 | 2159 | */ |
2160 | 2160 | public function createUpdates( $rev ) { |
| 2161 | + wfDeprecated( __METHOD__, '1.18' ); |
2161 | 2162 | global $wgUser; |
2162 | 2163 | $this->doEditUpdates( $rev, $wgUser, array( 'created' => true ) ); |
2163 | 2164 | } |
— | — | @@ -2176,7 +2177,7 @@ |
2177 | 2178 | public function preSaveTransform( $text, User $user = null, ParserOptions $popts = null ) { |
2178 | 2179 | global $wgParser, $wgUser; |
2179 | 2180 | |
2180 | | - wfDeprecated( __METHOD__ ); |
| 2181 | + wfDeprecated( __METHOD__, '1.19' ); |
2181 | 2182 | |
2182 | 2183 | $user = is_null( $user ) ? $wgUser : $user; |
2183 | 2184 | |
— | — | @@ -2686,6 +2687,7 @@ |
2687 | 2688 | * @deprecated since 1.18 |
2688 | 2689 | */ |
2689 | 2690 | public function quickEdit( $text, $comment = '', $minor = 0 ) { |
| 2691 | + wfDeprecated( __METHOD__, '1.18' ); |
2690 | 2692 | global $wgUser; |
2691 | 2693 | return $this->doQuickEdit( $text, $wgUser, $comment, $minor ); |
2692 | 2694 | } |
— | — | @@ -2694,6 +2696,7 @@ |
2695 | 2697 | * @deprecated since 1.18 |
2696 | 2698 | */ |
2697 | 2699 | public function viewUpdates() { |
| 2700 | + wfDeprecated( __METHOD__, '1.18' ); |
2698 | 2701 | global $wgUser; |
2699 | 2702 | return $this->doViewUpdates( $wgUser ); |
2700 | 2703 | } |
— | — | @@ -2702,6 +2705,7 @@ |
2703 | 2706 | * @deprecated since 1.18 |
2704 | 2707 | */ |
2705 | 2708 | public function useParserCache( $oldid ) { |
| 2709 | + wfDeprecated( __METHOD__, '1.18' ); |
2706 | 2710 | global $wgUser; |
2707 | 2711 | return $this->isParserCacheUsed( ParserOptions::newFromUser( $wgUser ), $oldid ); |
2708 | 2712 | } |
Index: trunk/phase3/includes/WikiError.php |
— | — | @@ -35,7 +35,7 @@ |
36 | 36 | * @deprecated since 1.17 |
37 | 37 | */ |
38 | 38 | function __construct( $message ) { |
39 | | - wfDeprecated( __METHOD__ ); |
| 39 | + wfDeprecated( __METHOD__, '1.17' ); |
40 | 40 | $this->mMessage = $message; |
41 | 41 | } |
42 | 42 | |
— | — | @@ -65,7 +65,7 @@ |
66 | 66 | * @deprecated since 1.17 |
67 | 67 | */ |
68 | 68 | public static function isError( $object ) { |
69 | | - wfDeprecated( __METHOD__ ); |
| 69 | + wfDeprecated( __METHOD__, '1.17' ); |
70 | 70 | if ( $object instanceof WikiError ) { |
71 | 71 | return true; |
72 | 72 | } elseif ( $object instanceof Status ) { |
— | — | @@ -88,7 +88,7 @@ |
89 | 89 | * @deprecated since 1.17 |
90 | 90 | */ |
91 | 91 | function __construct( $message/*, ... */ ) { |
92 | | - wfDeprecated( __METHOD__ ); |
| 92 | + wfDeprecated( __METHOD__, '1.17' ); |
93 | 93 | $args = func_get_args(); |
94 | 94 | array_shift( $args ); |
95 | 95 | $this->mMessage = wfMsgReal( $message, $args, true ); |
— | — | @@ -120,7 +120,7 @@ |
121 | 121 | * @deprecated since 1.17 |
122 | 122 | */ |
123 | 123 | function __construct( $parser, $message = 'XML parsing error', $context = null, $offset = 0 ) { |
124 | | - wfDeprecated( __METHOD__ ); |
| 124 | + wfDeprecated( __METHOD__, '1.17' ); |
125 | 125 | $this->mXmlError = xml_get_error_code( $parser ); |
126 | 126 | $this->mColumn = xml_get_current_column_number( $parser ); |
127 | 127 | $this->mLine = xml_get_current_line_number( $parser ); |
Index: trunk/phase3/includes/SpecialPage.php |
— | — | @@ -67,6 +67,7 @@ |
68 | 68 | * @deprecated since 1.18 |
69 | 69 | */ |
70 | 70 | static function initList() { |
| 71 | + wfDeprecated( __METHOD__, '1.18' ); |
71 | 72 | // Noop |
72 | 73 | } |
73 | 74 | |
— | — | @@ -74,6 +75,7 @@ |
75 | 76 | * @deprecated since 1.18 |
76 | 77 | */ |
77 | 78 | static function initAliasList() { |
| 79 | + wfDeprecated( __METHOD__, '1.18' ); |
78 | 80 | // Noop |
79 | 81 | } |
80 | 82 | |
— | — | @@ -86,6 +88,7 @@ |
87 | 89 | * @deprecated since 1.18 call SpecialPageFactory method directly |
88 | 90 | */ |
89 | 91 | static function resolveAlias( $alias ) { |
| 92 | + wfDeprecated( __METHOD__, '1.18' ); |
90 | 93 | list( $name, /*...*/ ) = SpecialPageFactory::resolveAlias( $alias ); |
91 | 94 | return $name; |
92 | 95 | } |
— | — | @@ -112,7 +115,7 @@ |
113 | 116 | * @deprecated since 1.7, warnings in 1.17, might be removed in 1.20 |
114 | 117 | */ |
115 | 118 | static function addPage( &$page ) { |
116 | | - wfDeprecated( __METHOD__ ); |
| 119 | + wfDeprecated( __METHOD__, '1.7' ); |
117 | 120 | SpecialPageFactory::getList()->{$page->mName} = $page; |
118 | 121 | } |
119 | 122 | |
— | — | @@ -125,6 +128,7 @@ |
126 | 129 | * @deprecated since 1.18 call SpecialPageFactory method directly |
127 | 130 | */ |
128 | 131 | static function setGroup( $page, $group ) { |
| 132 | + wfDeprecated( __METHOD__, '1.18' ); |
129 | 133 | return SpecialPageFactory::setGroup( $page, $group ); |
130 | 134 | } |
131 | 135 | |
— | — | @@ -136,6 +140,7 @@ |
137 | 141 | * @deprecated since 1.18 call SpecialPageFactory method directly |
138 | 142 | */ |
139 | 143 | static function getGroup( &$page ) { |
| 144 | + wfDeprecated( __METHOD__, '1.18' ); |
140 | 145 | return SpecialPageFactory::getGroup( $page ); |
141 | 146 | } |
142 | 147 | |
— | — | @@ -148,6 +153,7 @@ |
149 | 154 | * @param $name String the page to remove |
150 | 155 | */ |
151 | 156 | static function removePage( $name ) { |
| 157 | + wfDeprecated( __METHOD__, '1.18' ); |
152 | 158 | unset( SpecialPageFactory::getList()->$name ); |
153 | 159 | } |
154 | 160 | |
— | — | @@ -159,6 +165,7 @@ |
160 | 166 | * @deprecated since 1.18 call SpecialPageFactory method directly |
161 | 167 | */ |
162 | 168 | static function exists( $name ) { |
| 169 | + wfDeprecated( __METHOD__, '1.18' ); |
163 | 170 | return SpecialPageFactory::exists( $name ); |
164 | 171 | } |
165 | 172 | |
— | — | @@ -170,6 +177,7 @@ |
171 | 178 | * @deprecated since 1.18 call SpecialPageFactory method directly |
172 | 179 | */ |
173 | 180 | static function getPage( $name ) { |
| 181 | + wfDeprecated( __METHOD__, '1.18' ); |
174 | 182 | return SpecialPageFactory::getPage( $name ); |
175 | 183 | } |
176 | 184 | |
— | — | @@ -182,6 +190,7 @@ |
183 | 191 | * @deprecated since 1.18 call SpecialPageFactory method directly |
184 | 192 | */ |
185 | 193 | static function getPageByAlias( $alias ) { |
| 194 | + wfDeprecated( __METHOD__, '1.18' ); |
186 | 195 | return SpecialPageFactory::getPage( $alias ); |
187 | 196 | } |
188 | 197 | |
— | — | @@ -195,6 +204,7 @@ |
196 | 205 | * @deprecated since 1.18 call SpecialPageFactory method directly |
197 | 206 | */ |
198 | 207 | static function getUsablePages( User $user = null ) { |
| 208 | + wfDeprecated( __METHOD__, '1.18' ); |
199 | 209 | return SpecialPageFactory::getUsablePages( $user ); |
200 | 210 | } |
201 | 211 | |
— | — | @@ -205,6 +215,7 @@ |
206 | 216 | * @deprecated since 1.18 call SpecialPageFactory method directly |
207 | 217 | */ |
208 | 218 | static function getRegularPages() { |
| 219 | + wfDeprecated( __METHOD__, '1.18' ); |
209 | 220 | return SpecialPageFactory::getRegularPages(); |
210 | 221 | } |
211 | 222 | |
— | — | @@ -216,6 +227,7 @@ |
217 | 228 | * @deprecated since 1.18 call SpecialPageFactory method directly |
218 | 229 | */ |
219 | 230 | static function getRestrictedPages() { |
| 231 | + wfDeprecated( __METHOD__, '1.18' ); |
220 | 232 | return SpecialPageFactory::getRestrictedPages(); |
221 | 233 | } |
222 | 234 | |
— | — | @@ -234,6 +246,7 @@ |
235 | 247 | * @deprecated since 1.18 call SpecialPageFactory method directly |
236 | 248 | */ |
237 | 249 | public static function executePath( &$title, IContextSource &$context, $including = false ) { |
| 250 | + wfDeprecated( __METHOD__, '1.18' ); |
238 | 251 | return SpecialPageFactory::executePath( $title, $context, $including ); |
239 | 252 | } |
240 | 253 | |
— | — | @@ -247,6 +260,7 @@ |
248 | 261 | * @deprecated since 1.18 call SpecialPageFactory method directly |
249 | 262 | */ |
250 | 263 | static function getLocalNameFor( $name, $subpage = false ) { |
| 264 | + wfDeprecated( __METHOD__, '1.18' ); |
251 | 265 | return SpecialPageFactory::getLocalNameFor( $name, $subpage ); |
252 | 266 | } |
253 | 267 | |
— | — | @@ -290,6 +304,7 @@ |
291 | 305 | * @deprecated since 1.18 call SpecialPageFactory method directly |
292 | 306 | */ |
293 | 307 | static function getTitleForAlias( $alias ) { |
| 308 | + wfDeprecated( __METHOD__, '1.18' ); |
294 | 309 | return SpecialPageFactory::getTitleForAlias( $alias ); |
295 | 310 | } |
296 | 311 | |
— | — | @@ -353,11 +368,11 @@ |
354 | 369 | * @deprecated since 1.17, call parent::__construct() |
355 | 370 | */ |
356 | 371 | public function __call( $fName, $a ) { |
| 372 | + // Deprecated messages now, remove in 1.19 or 1.20? |
| 373 | + wfDeprecated( __METHOD__, '1.17' ); |
| 374 | + |
357 | 375 | // Sometimes $fName is SpecialPage, sometimes it's specialpage. <3 PHP |
358 | 376 | if( strtolower( $fName ) == 'specialpage' ) { |
359 | | - // Deprecated messages now, remove in 1.19 or 1.20? |
360 | | - wfDeprecated( __METHOD__ ); |
361 | | - |
362 | 377 | $name = isset( $a[0] ) ? $a[0] : ''; |
363 | 378 | $restriction = isset( $a[1] ) ? $a[1] : ''; |
364 | 379 | $listed = isset( $a[2] ) ? $a[2] : true; |
— | — | @@ -395,6 +410,7 @@ |
396 | 411 | * @deprecated since 1.18 |
397 | 412 | */ |
398 | 413 | function getFile() { |
| 414 | + wfDeprecated( __METHOD__, '1.18' ); |
399 | 415 | return $this->mFile; |
400 | 416 | } |
401 | 417 | |
— | — | @@ -441,11 +457,11 @@ |
442 | 458 | * @return Mixed |
443 | 459 | * @deprecated since 1.18 |
444 | 460 | */ |
445 | | - function name( $x = null ) { return wfSetVar( $this->mName, $x ); } |
446 | | - function restriction( $x = null) { return wfSetVar( $this->mRestriction, $x ); } |
447 | | - function func( $x = null) { return wfSetVar( $this->mFunction, $x ); } |
448 | | - function file( $x = null) { return wfSetVar( $this->mFile, $x ); } |
449 | | - function includable( $x = null ) { return wfSetVar( $this->mIncludable, $x ); } |
| 461 | + function name( $x = null ) { wfDeprecated( __METHOD__, '1.18' ); return wfSetVar( $this->mName, $x ); } |
| 462 | + function restriction( $x = null) { wfDeprecated( __METHOD__, '1.18' ); return wfSetVar( $this->mRestriction, $x ); } |
| 463 | + function func( $x = null) { wfDeprecated( __METHOD__, '1.18' ); return wfSetVar( $this->mFunction, $x ); } |
| 464 | + function file( $x = null) { wfDeprecated( __METHOD__, '1.18' ); return wfSetVar( $this->mFile, $x ); } |
| 465 | + function includable( $x = null ) { wfDeprecated( __METHOD__, '1.18' ); return wfSetVar( $this->mIncludable, $x ); } |
450 | 466 | |
451 | 467 | /** |
452 | 468 | * Whether the special page is being evaluated via transclusion |
— | — | @@ -684,6 +700,7 @@ |
685 | 701 | * @since 1.18 |
686 | 702 | */ |
687 | 703 | public function getLang() { |
| 704 | + wfDeprecated( __METHOD__, '1.19' ); |
688 | 705 | return $this->getLanguage(); |
689 | 706 | } |
690 | 707 | |
Index: trunk/phase3/includes/LogPage.php |
— | — | @@ -175,6 +175,7 @@ |
176 | 176 | * @deprecated in 1.19, warnings in 1.21. Use getName() |
177 | 177 | */ |
178 | 178 | public static function logName( $type ) { |
| 179 | + wfDeprecated( __METHOD__, '1.19' ); |
179 | 180 | global $wgLogNames; |
180 | 181 | |
181 | 182 | if( isset( $wgLogNames[$type] ) ) { |
— | — | @@ -194,6 +195,7 @@ |
195 | 196 | * @deprecated in 1.19, warnings in 1.21. Use getDescription() |
196 | 197 | */ |
197 | 198 | public static function logHeader( $type ) { |
| 199 | + wfDeprecated( __METHOD__, '1.19' ); |
198 | 200 | global $wgLogHeaders; |
199 | 201 | return wfMsgExt( $wgLogHeaders[$type], array( 'parseinline' ) ); |
200 | 202 | } |