| Index: trunk/phase3/includes/upload/UploadFromUrl.php |
| — | — | @@ -7,12 +7,11 @@ |
| 8 | 8 | * @author Bryan Tong Minh |
| 9 | 9 | * @author Michael Dale |
| 10 | 10 | */ |
| 11 | | - |
| 12 | 11 | class UploadFromUrl extends UploadBase { |
| 13 | 12 | protected $mAsync, $mUrl; |
| 14 | 13 | protected $mIgnoreWarnings = true; |
| 15 | 14 | |
| 16 | | - protected $mTempPath; |
| | 15 | + protected $mTempPath, $mTmpHandle; |
| 17 | 16 | |
| 18 | 17 | /** |
| 19 | 18 | * Checks if the user is allowed to use the upload-by-URL feature. If the |
| — | — | @@ -78,6 +77,7 @@ |
| 79 | 78 | |
| 80 | 79 | /** |
| 81 | 80 | * @param $request WebRequest object |
| | 81 | + * @return bool |
| 82 | 82 | */ |
| 83 | 83 | public static function isValidRequest( $request ) { |
| 84 | 84 | global $wgUser; |
| — | — | @@ -88,8 +88,14 @@ |
| 89 | 89 | && $wgUser->isAllowed( 'upload_by_url' ); |
| 90 | 90 | } |
| 91 | 91 | |
| | 92 | + /** |
| | 93 | + * @return string |
| | 94 | + */ |
| 92 | 95 | public function getSourceType() { return 'url'; } |
| 93 | 96 | |
| | 97 | + /** |
| | 98 | + * @return Status |
| | 99 | + */ |
| 94 | 100 | public function fetchFile() { |
| 95 | 101 | if ( !Http::isValidURI( $this->mUrl ) ) { |
| 96 | 102 | return Status::newFatal( 'http-invalid-url' ); |
| — | — | @@ -133,6 +139,7 @@ |
| 134 | 140 | /** |
| 135 | 141 | * Download the file, save it to the temporary file and update the file |
| 136 | 142 | * size and set $mRemoveTempFile to true. |
| | 143 | + * @return Status |
| 137 | 144 | */ |
| 138 | 145 | protected function reallyFetchFile() { |
| 139 | 146 | if ( $this->mTempPath === false ) { |
| Index: trunk/phase3/includes/specials/SpecialUserlogin.php |
| — | — | @@ -1072,8 +1072,9 @@ |
| 1073 | 1073 | # Prepare language selection links as needed |
| 1074 | 1074 | if( $wgLoginLanguageSelector ) { |
| 1075 | 1075 | $template->set( 'languages', $this->makeLanguageSelector() ); |
| 1076 | | - if( $this->mLanguage ) |
| | 1076 | + if( $this->mLanguage ) { |
| 1077 | 1077 | $template->set( 'uselang', $this->mLanguage ); |
| | 1078 | + } |
| 1078 | 1079 | } |
| 1079 | 1080 | |
| 1080 | 1081 | // Use loginend-https for HTTPS requests if it's not blank, loginend otherwise |
| Index: trunk/phase3/includes/specials/SpecialContributions.php |
| — | — | @@ -268,6 +268,7 @@ |
| 269 | 269 | * @param $talkpage Title: Talk page |
| 270 | 270 | * @param $target User: Target user object |
| 271 | 271 | * @param $subject User: The viewing user ($wgUser might be still checked in some cases) |
| | 272 | + * @return array |
| 272 | 273 | */ |
| 273 | 274 | public static function getUserLinks( Title $userpage, Title $talkpage, User $target, User $subject ) { |
| 274 | 275 | |
| — | — | @@ -716,10 +717,16 @@ |
| 717 | 718 | return $revLens; |
| 718 | 719 | } |
| 719 | 720 | |
| | 721 | + /** |
| | 722 | + * @return string |
| | 723 | + */ |
| 720 | 724 | function getStartBody() { |
| 721 | 725 | return "<ul>\n"; |
| 722 | 726 | } |
| 723 | 727 | |
| | 728 | + /** |
| | 729 | + * @return string |
| | 730 | + */ |
| 724 | 731 | function getEndBody() { |
| 725 | 732 | return "</ul>\n"; |
| 726 | 733 | } |
| Index: trunk/phase3/includes/SpecialPage.php |
| — | — | @@ -672,7 +672,7 @@ |
| 673 | 673 | /** |
| 674 | 674 | * Gets the context this SpecialPage is executed in |
| 675 | 675 | * |
| 676 | | - * @return IContextSource |
| | 676 | + * @return IContextSource|RequestContext |
| 677 | 677 | * @since 1.18 |
| 678 | 678 | */ |
| 679 | 679 | public function getContext() { |