Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove never thrown UploadStashNotAvailableException

Browse source 
Also move creation of UploadStash to main entry point of the special
page to avoid use of context before it is set (by called getUser).

Change-Id: Ibcb17b6ee1b853d807f91104ba428b307e9a5208
This commit is contained in:
umherirrender 2015-03-14 15:12:05 +01:00 committed by Umherirrender
parent 3ba8243cd6
commit 50b1cd2fbc
4 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
autoload.php
View file

@ -1264,7 +1264,6 @@ $wgAutoloadLocalClasses = array(
'UploadStashFileException' => __DIR__ . '/includes/upload/UploadStash.php',
'UploadStashFileNotFoundException' => __DIR__ . '/includes/upload/UploadStash.php',
'UploadStashNoSuchKeyException' => __DIR__ . '/includes/upload/UploadStash.php',
'UploadStashNotAvailableException' => __DIR__ . '/includes/upload/UploadStash.php',
'UploadStashNotLoggedInException' => __DIR__ . '/includes/upload/UploadStash.php',
'UploadStashWrongOwnerException' => __DIR__ . '/includes/upload/UploadStash.php',
'UploadStashZeroLengthFileException' => __DIR__ . '/includes/upload/UploadStash.php',

2
includes/api/ApiQueryStashImageInfo.php
View file

@ -62,8 +62,6 @@ class ApiQueryStashImageInfo extends ApiQueryImageInfo {
$result->setIndexedTagName_internal( array( 'query', $this->getModuleName() ), $modulePrefix );
}
// @todo Update exception handling here to understand current getFile exceptions
} catch ( UploadStashNotAvailableException $e ) {
$this->dieUsage( "Session not available: " . $e->getMessage(), "nosession" );
} catch ( UploadStashFileNotFoundException $e ) {
$this->dieUsage( "File not found: " . $e->getMessage(), "invalidsessiondata" );
} catch ( UploadStashBadPathException $e ) {

5
includes/specials/SpecialUploadStash.php
View file

@ -48,10 +48,6 @@ class SpecialUploadStash extends UnlistedSpecialPage {
public function __construct() {
parent::__construct( 'UploadStash', 'upload' );
try {
$this->stash = RepoGroup::singleton()->getLocalRepo()->getUploadStash( $this->getUser() );
} catch ( UploadStashNotAvailableException $e ) {
}
}
/**
@ -62,6 +58,7 @@ class SpecialUploadStash extends UnlistedSpecialPage {
* @return bool Success
*/
public function execute( $subPage ) {
$this->stash = RepoGroup::singleton()->getLocalRepo()->getUploadStash( $this->getUser() );
$this->checkPermissions();
if ( $subPage === null || $subPage === '' ) {

3
includes/upload/UploadStash.php
View file

@ -727,9 +727,6 @@ class UploadStashFile extends UnregisteredLocalFile {
class UploadStashException extends MWException {
}
class UploadStashNotAvailableException extends UploadStashException {
}
class UploadStashFileNotFoundException extends UploadStashException {
}