| Index: trunk/phase3/maintenance/tests/UploadFromUrlTest.php |
| — | — | @@ -180,7 +180,7 @@ |
| 181 | 181 | $job = Job::pop(); |
| 182 | 182 | $this->assertFalse( $job ); |
| 183 | 183 | |
| 184 | | - self::deleteFile( 'Test.png' ); |
| | 184 | + $this->deleteFile( 'Test.png' ); |
| 185 | 185 | |
| 186 | 186 | $wgUser->addGroup( 'users' ); |
| 187 | 187 | $data = $this->doApiRequest( array( |
| — | — | @@ -207,7 +207,7 @@ |
| 208 | 208 | |
| 209 | 209 | $this->assertTrue( $t->exists() ); |
| 210 | 210 | |
| 211 | | - self::deleteFile( 'Test.png' ); |
| | 211 | + $this->deleteFile( 'Test.png' ); |
| 212 | 212 | } |
| 213 | 213 | |
| 214 | 214 | /** |
| Index: trunk/phase3/maintenance/installExtension.php |
| — | — | @@ -264,11 +264,13 @@ |
| 265 | 265 | */ |
| 266 | 266 | class LocalInstallerResource extends InstallerResource { |
| 267 | 267 | function LocalInstallerResource( $path ) { |
| 268 | | - InstallerResource::InstallerResource( $path, is_dir( $path ), true ); |
| | 268 | + parent::InstallerResource( $path, is_dir( $path ), true ); |
| 269 | 269 | } |
| 270 | 270 | |
| 271 | 271 | function fetch( $target ) { |
| 272 | | - if ( $this->isdir ) return ExtensionInstaller::copyDir( $this->path, dirname( $target ) ); |
| | 272 | + if ( $this->isdir ) { |
| | 273 | + return ExtensionInstaller::copyDir( $this->path, dirname( $target ) ); |
| | 274 | + } |
| 273 | 275 | else return $this->extract( $this->path, dirname( $target ) ); |
| 274 | 276 | } |
| 275 | 277 | |
| — | — | @@ -279,7 +281,7 @@ |
| 280 | 282 | */ |
| 281 | 283 | class WebInstallerResource extends InstallerResource { |
| 282 | 284 | function WebInstallerResource( $path ) { |
| 283 | | - InstallerResource::InstallerResource( $path, false, false ); |
| | 285 | + parent::InstallerResource( $path, false, false ); |
| 284 | 286 | } |
| 285 | 287 | |
| 286 | 288 | function fetch( $target ) { |
| — | — | @@ -305,7 +307,7 @@ |
| 306 | 308 | */ |
| 307 | 309 | class SVNInstallerResource extends InstallerResource { |
| 308 | 310 | function SVNInstallerResource( $path ) { |
| 309 | | - InstallerResource::InstallerResource( $path, true, false ); |
| | 311 | + parent::InstallerResource( $path, true, false ); |
| 310 | 312 | } |
| 311 | 313 | |
| 312 | 314 | function fetch( $target ) { |
| — | — | @@ -333,7 +335,9 @@ |
| 334 | 336 | var $tasks; |
| 335 | 337 | |
| 336 | 338 | function ExtensionInstaller( $name, $source, $target ) { |
| 337 | | - if ( !is_object( $source ) ) $source = InstallerResource::makeResource( $source ); |
| | 339 | + if ( !is_object( $source ) ) { |
| | 340 | + $source = parent::makeResource( $source ); |
| | 341 | + } |
| 338 | 342 | |
| 339 | 343 | $this->name = $name; |
| 340 | 344 | $this->source = $source; |
| Index: trunk/phase3/includes/ImagePage.php |
| — | — | @@ -760,7 +760,7 @@ |
| 761 | 761 | $this->loadFile(); |
| 762 | 762 | if ( !$this->img->exists() || !$this->img->isLocal() || $this->img->getRedirected() ) { |
| 763 | 763 | // Standard article deletion |
| 764 | | - Article::delete(); |
| | 764 | + parent::delete(); |
| 765 | 765 | return; |
| 766 | 766 | } |
| 767 | 767 | $deleter = new FileDeleteForm( $this->img ); |
| Index: trunk/phase3/includes/api/ApiUpload.php |
| — | — | @@ -60,14 +60,14 @@ |
| 61 | 61 | * Upload stashed in a previous request |
| 62 | 62 | */ |
| 63 | 63 | // Check the session key |
| 64 | | - if ( !isset( $_SESSION[UploadBase::getSessionKey()][$this->mParams['sessionkey']] ) ) { |
| | 64 | + if ( !isset( $_SESSION[$this->mUpload->getSessionKey()][$this->mParams['sessionkey']] ) ) { |
| 65 | 65 | $this->dieUsageMsg( array( 'invalid-session-key' ) ); |
| 66 | 66 | } |
| 67 | 67 | |
| 68 | 68 | $this->mUpload = new UploadFromStash(); |
| 69 | 69 | $this->mUpload->initialize( $this->mParams['filename'], |
| 70 | 70 | $this->mParams['sessionkey'], |
| 71 | | - $_SESSION[UploadBase::getSessionKey()][$this->mParams['sessionkey']] ); |
| | 71 | + $_SESSION[$this->mUpload->getSessionKey()][$this->mParams['sessionkey']] ); |
| 72 | 72 | } elseif ( isset( $this->mParams['filename'] ) ) { |
| 73 | 73 | /** |
| 74 | 74 | * Upload from URL, etc. |