| Index: trunk/phase3/includes/api/ApiQueryRecentChanges.php |
| — | — | @@ -132,7 +132,7 @@ |
| 133 | 133 | || ( isset ( $show['redirect'] ) && isset ( $show['!redirect'] ) ) |
| 134 | 134 | || ( isset ( $show['patrolled'] ) && isset ( $show['!patrolled'] ) ) ) { |
| 135 | 135 | |
| 136 | | - $this->dieUsage( "Incorrect parameter - mutually exclusive values may not be supplied", 'show' ); |
| | 136 | + $this->dieUsageMsg( 'show' ); |
| 137 | 137 | } |
| 138 | 138 | |
| 139 | 139 | // Check permissions |
| — | — | @@ -529,7 +529,7 @@ |
| 530 | 530 | |
| 531 | 531 | public function getPossibleErrors() { |
| 532 | 532 | return array_merge( parent::getPossibleErrors(), array( |
| 533 | | - array( 'code' => 'show', 'info' => 'Incorrect parameter - mutually exclusive values may not be supplied' ), |
| | 533 | + array( 'show' ), |
| 534 | 534 | array( 'code' => 'permissiondenied', 'info' => 'You need the patrol right to request the patrolled flag' ), |
| 535 | 535 | array( 'code' => 'user-excludeuser', 'info' => 'user and excludeuser cannot be used together' ), |
| 536 | 536 | ) ); |
| Index: trunk/phase3/includes/api/ApiQueryWatchlistRaw.php |
| — | — | @@ -59,7 +59,7 @@ |
| 60 | 60 | $prop = array_flip( (array)$params['prop'] ); |
| 61 | 61 | $show = array_flip( (array)$params['show'] ); |
| 62 | 62 | if ( isset( $show['changed'] ) && isset( $show['!changed'] ) ) |
| 63 | | - $this->dieUsage( "Incorrect parameter - mutually exclusive values may not be supplied", 'show' ); |
| | 63 | + $this->dieUsageMsg( 'show' ); |
| 64 | 64 | |
| 65 | 65 | $this->addTables( 'watchlist' ); |
| 66 | 66 | $this->addFields( array( 'wl_namespace', 'wl_title' ) ); |
| — | — | @@ -174,7 +174,7 @@ |
| 175 | 175 | public function getPossibleErrors() { |
| 176 | 176 | return array_merge( parent::getPossibleErrors(), array( |
| 177 | 177 | array( 'code' => 'notloggedin', 'info' => 'You must be logged-in to have a watchlist' ), |
| 178 | | - array( 'code' => 'show', 'info' => 'Incorrect parameter - mutually exclusive values may not be supplied' ), |
| | 178 | + array( 'show' ), |
| 179 | 179 | ) ); |
| 180 | 180 | } |
| 181 | 181 | |
| Index: trunk/phase3/includes/api/ApiQueryWatchlist.php |
| — | — | @@ -151,7 +151,7 @@ |
| 152 | 152 | || ( isset ( $show['anon'] ) && isset ( $show['!anon'] ) ) |
| 153 | 153 | || ( isset ( $show['patrolled'] ) && isset ( $show['!patrolled'] ) ) ) { |
| 154 | 154 | |
| 155 | | - $this->dieUsage( "Incorrect parameter - mutually exclusive values may not be supplied", 'show' ); |
| | 155 | + $this->dieUsageMsg( 'show' ); |
| 156 | 156 | } |
| 157 | 157 | |
| 158 | 158 | // Check permissions. FIXME: should this check $user instead of $wgUser? |
| — | — | @@ -379,7 +379,7 @@ |
| 380 | 380 | array( 'code' => 'bad_wltoken', 'info' => 'Incorrect watchlist token provided -- please set a correct token in Special:Preferences' ), |
| 381 | 381 | array( 'code' => 'notloggedin', 'info' => 'You must be logged-in to have a watchlist' ), |
| 382 | 382 | array( 'code' => 'patrol', 'info' => 'patrol property is not available' ), |
| 383 | | - array( 'code' => 'show', 'info' => 'Incorrect parameter - mutually exclusive values may not be supplied' ), |
| | 383 | + array( 'show' ), |
| 384 | 384 | array( 'code' => 'permissiondenied', 'info' => 'You need the patrol right to request the patrolled flag' ), |
| 385 | 385 | array( 'code' => 'user-excludeuser', 'info' => 'user and excludeuser cannot be used together' ), |
| 386 | 386 | ) ); |
| Index: trunk/phase3/includes/api/ApiBase.php |
| — | — | @@ -865,6 +865,7 @@ |
| 866 | 866 | 'cantoverwrite-sharedfile' => array( 'code' => 'cantoverwrite-sharedfile', 'info' => 'The target file exists on a shared repository and you do not have permission to override it' ), |
| 867 | 867 | 'sharedfile-exists' => array( 'code' => 'fileexists-sharedrepo-perm', 'info' => 'The target file exists on a shared repository. Use the ignorewarnings parameter to override it.' ), |
| 868 | 868 | 'mustbeposted' => array( 'code' => 'mustbeposted', 'info' => "The \$1 module requires a POST request" ), |
| | 869 | + 'show' => array( 'code' => 'show', 'info' => 'Incorrect parameter - mutually exclusive values may not be supplied' ), |
| 869 | 870 | |
| 870 | 871 | // ApiEditPage messages |
| 871 | 872 | 'noimageredirect-anon' => array( 'code' => 'noimageredirect-anon', 'info' => "Anonymous users can't create image redirects" ), |
| Index: trunk/phase3/includes/api/ApiQueryCategories.php |
| — | — | @@ -93,7 +93,7 @@ |
| 94 | 94 | } |
| 95 | 95 | |
| 96 | 96 | if ( isset( $show['hidden'] ) && isset( $show['!hidden'] ) ) |
| 97 | | - $this->dieUsage( "Incorrect parameter - mutually exclusive values may not be supplied", 'show' ); |
| | 97 | + $this->dieUsageMsg( 'show' ); |
| 98 | 98 | if ( isset( $show['hidden'] ) || isset( $show['!hidden'] ) || isset( $prop['hidden'] ) ) |
| 99 | 99 | { |
| 100 | 100 | $this->addOption( 'STRAIGHT_JOIN' ); |
| — | — | @@ -220,7 +220,7 @@ |
| 221 | 221 | |
| 222 | 222 | public function getPossibleErrors() { |
| 223 | 223 | return array_merge( parent::getPossibleErrors(), array( |
| 224 | | - array( 'code' => 'show', 'info' => 'Incorrect parameter - mutually exclusive values may not be supplied' ), |
| | 224 | + array( 'show' ), |
| 225 | 225 | ) ); |
| 226 | 226 | } |
| 227 | 227 | |
| Index: trunk/phase3/includes/api/ApiQueryUserContributions.php |
| — | — | @@ -185,7 +185,7 @@ |
| 186 | 186 | $show = array_flip( $show ); |
| 187 | 187 | if ( ( isset( $show['minor'] ) && isset( $show['!minor'] ) ) |
| 188 | 188 | || ( isset( $show['patrolled'] ) && isset( $show['!patrolled'] ) ) ) |
| 189 | | - $this->dieUsage( "Incorrect parameter - mutually exclusive values may not be supplied", 'show' ); |
| | 189 | + $this->dieUsageMsg( 'show' ); |
| 190 | 190 | |
| 191 | 191 | $this->addWhereIf( 'rev_minor_edit = 0', isset( $show['!minor'] ) ); |
| 192 | 192 | $this->addWhereIf( 'rev_minor_edit != 0', isset( $show['minor'] ) ); |
| — | — | @@ -422,7 +422,7 @@ |
| 423 | 423 | return array_merge( parent::getPossibleErrors(), array( |
| 424 | 424 | array( 'code' => 'param_user', 'info' => 'User parameter may not be empty.' ), |
| 425 | 425 | array( 'code' => 'param_user', 'info' => 'User name user is not valid' ), |
| 426 | | - array( 'code' => 'show', 'info' => 'Incorrect parameter - mutually exclusive values may not be supplied' ), |
| | 426 | + array( 'show' ), |
| 427 | 427 | array( 'code' => 'permissiondenied', 'info' => 'You need the patrol right to request the patrolled flag' ), |
| 428 | 428 | ) ); |
| 429 | 429 | } |