| Index: trunk/phase3/includes/GlobalFunctions.php |
| — | — | @@ -3526,7 +3526,7 @@ |
| 3527 | 3527 | /** |
| 3528 | 3528 | * Get a cache object. |
| 3529 | 3529 | * |
| 3530 | | - * @param integer $inputType Cache type, one the the CACHE_* constants. |
| | 3530 | + * @param $inputType integer Cache type, one the the CACHE_* constants. |
| 3531 | 3531 | * @return BagOStuff |
| 3532 | 3532 | */ |
| 3533 | 3533 | function wfGetCache( $inputType ) { |
| Index: trunk/phase3/includes/Init.php |
| — | — | @@ -70,15 +70,20 @@ |
| 71 | 71 | /** |
| 72 | 72 | * The equivalent of MWInit::interpretedPath() but for files relative to the |
| 73 | 73 | * extensions directory. |
| | 74 | + * |
| | 75 | + * @param $file string |
| | 76 | + * @return string |
| 74 | 77 | */ |
| 75 | 78 | static function extInterpretedPath( $file ) { |
| 76 | 79 | return self::getExtensionsDirectory() . '/' . $file; |
| 77 | 80 | } |
| 78 | 81 | |
| 79 | 82 | /** |
| 80 | | - * The equivalent of MWInit::compiledPath() but for files relative to the |
| | 83 | + * The equivalent of MWInit::compiledPath() but for files relative to the |
| 81 | 84 | * extensions directory. Any files referenced in this way must be registered |
| 82 | 85 | * for compilation by including them in $wgCompiledFiles. |
| | 86 | + * @param $file string |
| | 87 | + * @return string |
| 83 | 88 | */ |
| 84 | 89 | static function extCompiledPath( $file ) { |
| 85 | 90 | if ( defined( 'MW_COMPILED' ) ) { |
| — | — | @@ -95,8 +100,10 @@ |
| 96 | 101 | * |
| 97 | 102 | * require( MWInit::extSetupPath( 'ParserFunctions/ParserFunctions.php' ) ); |
| 98 | 103 | * |
| 99 | | - * @param $path The path relative to the extensions directory, as defined by |
| | 104 | + * @param $extRel string The path relative to the extensions directory, as defined by |
| 100 | 105 | * $wgExtensionsDirectory. |
| | 106 | + * |
| | 107 | + * @return string |
| 101 | 108 | */ |
| 102 | 109 | static function extSetupPath( $extRel ) { |
| 103 | 110 | $baseRel = "extensions/$extRel"; |
| — | — | @@ -109,6 +116,9 @@ |
| 110 | 117 | } |
| 111 | 118 | } |
| 112 | 119 | |
| | 120 | + /** |
| | 121 | + * @return bool|string |
| | 122 | + */ |
| 113 | 123 | static function getExtensionsDirectory() { |
| 114 | 124 | global $wgExtensionsDirectory, $IP; |
| 115 | 125 | if ( $wgExtensionsDirectory === false ) { |
| — | — | @@ -160,8 +170,12 @@ |
| 161 | 171 | } |
| 162 | 172 | |
| 163 | 173 | /** |
| 164 | | - * Call a static method of a class with variable arguments without causing |
| | 174 | + * Call a static method of a class with variable arguments without causing |
| 165 | 175 | * it to become volatile. |
| | 176 | + * @param $className string |
| | 177 | + * @param $methodName string |
| | 178 | + * @param $args array |
| | 179 | + * |
| 166 | 180 | */ |
| 167 | 181 | static function callStaticMethod( $className, $methodName, $args ) { |
| 168 | 182 | $r = new ReflectionMethod( $className, $methodName ); |
| Index: trunk/phase3/includes/actions/WatchAction.php |
| — | — | @@ -50,7 +50,6 @@ |
| 51 | 51 | |
| 52 | 52 | if ( !$user->matchEditToken( $this->getRequest()->getVal( 'token' ), $salt ) ) { |
| 53 | 53 | throw new ErrorPageError( 'sessionfailure-title', 'sessionfailure' ); |
| 54 | | - return; |
| 55 | 54 | } |
| 56 | 55 | |
| 57 | 56 | return parent::checkCanExecute( $user ); |