| Index: trunk/phase3/includes/Sanitizer.php |
| — | — | @@ -920,8 +920,9 @@ |
| 921 | 921 | * @param string $text |
| 922 | 922 | * @return string |
| 923 | 923 | * @public |
| | 924 | + * @static |
| 924 | 925 | */ |
| 925 | | - function decodeCharReferences( $text ) { |
| | 926 | + public static function decodeCharReferences( $text ) { |
| 926 | 927 | return preg_replace_callback( |
| 927 | 928 | MW_CHAR_REFS_REGEX, |
| 928 | 929 | array( 'Sanitizer', 'decodeCharReferencesCallback' ), |
| — | — | @@ -932,7 +933,7 @@ |
| 933 | 934 | * @param string $matches |
| 934 | 935 | * @return string |
| 935 | 936 | */ |
| 936 | | - function decodeCharReferencesCallback( $matches ) { |
| | 937 | + static function decodeCharReferencesCallback( $matches ) { |
| 937 | 938 | if( $matches[1] != '' ) { |
| 938 | 939 | return Sanitizer::decodeEntity( $matches[1] ); |
| 939 | 940 | } elseif( $matches[2] != '' ) { |
| Index: trunk/phase3/includes/Title.php |
| — | — | @@ -108,7 +108,7 @@ |
| 109 | 109 | * @static |
| 110 | 110 | * @access public |
| 111 | 111 | */ |
| 112 | | - function newFromText( $text, $defaultNamespace = NS_MAIN ) { |
| | 112 | + public static function newFromText( $text, $defaultNamespace = NS_MAIN ) { |
| 113 | 113 | $fname = 'Title::newFromText'; |
| 114 | 114 | |
| 115 | 115 | if( is_object( $text ) ) { |
| — | — | @@ -233,7 +233,7 @@ |
| 234 | 234 | * @static |
| 235 | 235 | * @access public |
| 236 | 236 | */ |
| 237 | | - function &makeTitle( $ns, $title ) { |
| | 237 | + public static function &makeTitle( $ns, $title ) { |
| 238 | 238 | $t =& new Title(); |
| 239 | 239 | $t->mInterwiki = ''; |
| 240 | 240 | $t->mFragment = ''; |
| Index: trunk/phase3/includes/Parser.php |
| — | — | @@ -4556,7 +4556,7 @@ |
| 4557 | 4557 | * Get parser options |
| 4558 | 4558 | * @static |
| 4559 | 4559 | */ |
| 4560 | | - function newFromUser( &$user ) { |
| | 4560 | + static function newFromUser( &$user ) { |
| 4561 | 4561 | return new ParserOptions( $user ); |
| 4562 | 4562 | } |
| 4563 | 4563 | |
| Index: trunk/phase3/includes/LoadBalancer.php |
| — | — | @@ -50,7 +50,7 @@ |
| 51 | 51 | $this->mAllowLag = false; |
| 52 | 52 | } |
| 53 | 53 | |
| 54 | | - function newFromParams( $servers, $failFunction = false, $waitTimeout = 10 ) |
| | 54 | + static function newFromParams( $servers, $failFunction = false, $waitTimeout = 10 ) |
| 55 | 55 | { |
| 56 | 56 | $lb = new LoadBalancer; |
| 57 | 57 | $lb->initialise( $servers, $failFunction, $waitTimeout ); |