| Index: trunk/phase3/tests/phpunit/includes/parser/NewParserTest.php |
| — | — | @@ -668,7 +668,6 @@ |
| 669 | 669 | * |
| 670 | 670 | * @param $text String: the text to tidy |
| 671 | 671 | * @return String |
| 672 | | - * @static |
| 673 | 672 | */ |
| 674 | 673 | protected function tidy( $text ) { |
| 675 | 674 | global $wgUseTidy; |
| Index: trunk/phase3/tests/parser/parserTest.inc |
| — | — | @@ -1205,7 +1205,6 @@ |
| 1206 | 1206 | * |
| 1207 | 1207 | * @param $text String: the text to tidy |
| 1208 | 1208 | * @return String |
| 1209 | | - * @static |
| 1210 | 1209 | */ |
| 1211 | 1210 | private function tidy( $text ) { |
| 1212 | 1211 | global $wgUseTidy; |
| Index: trunk/phase3/includes/User.php |
| — | — | @@ -2864,22 +2864,6 @@ |
| 2865 | 2865 | } |
| 2866 | 2866 | |
| 2867 | 2867 | /** |
| 2868 | | - * Get the maximum valid user ID. |
| 2869 | | - * @return Integer: User ID |
| 2870 | | - * @static |
| 2871 | | - */ |
| 2872 | | - function getMaxID() { |
| 2873 | | - static $res; // cache |
| 2874 | | - |
| 2875 | | - if ( isset( $res ) ) { |
| 2876 | | - return $res; |
| 2877 | | - } else { |
| 2878 | | - $dbr = wfGetDB( DB_SLAVE ); |
| 2879 | | - return $res = $dbr->selectField( 'user', 'max(user_id)', false, __METHOD__ ); |
| 2880 | | - } |
| 2881 | | - } |
| 2882 | | - |
| 2883 | | - /** |
| 2884 | 2868 | * Determine whether the user is a newbie. Newbies are either |
| 2885 | 2869 | * anonymous IPs, or the most recently created accounts. |
| 2886 | 2870 | * @return Bool |
| Index: trunk/phase3/includes/specials/SpecialAllpages.php |
| — | — | @@ -468,10 +468,8 @@ |
| 469 | 469 | * @param $ns Integer: the namespace of the article |
| 470 | 470 | * @param $text String: the name of the article |
| 471 | 471 | * @return array( int namespace, string dbkey, string pagename ) or NULL on error |
| 472 | | - * @static (sort of) |
| 473 | | - * @access private |
| 474 | 472 | */ |
| 475 | | - function getNamespaceKeyAndText($ns, $text) { |
| | 473 | + protected function getNamespaceKeyAndText($ns, $text) { |
| 476 | 474 | if ( $text == '' ) |
| 477 | 475 | return array( $ns, '', '' ); # shortcut for common case |
| 478 | 476 | |