diff options
Diffstat (limited to 'includes/api/ApiQueryAllCategories.php')
| -rw-r--r-- | includes/api/ApiQueryAllCategories.php | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/includes/api/ApiQueryAllCategories.php b/includes/api/ApiQueryAllCategories.php index 4f4c77f0..3f5c6ee7 100644 --- a/includes/api/ApiQueryAllCategories.php +++ b/includes/api/ApiQueryAllCategories.php @@ -60,10 +60,7 @@ class ApiQueryAllCategories extends ApiQueryGeneratorBase { if ( !is_null( $params['continue'] ) ) { $cont = explode( '|', $params['continue'] ); - if ( count( $cont ) != 1 ) { - $this->dieUsage( "Invalid continue param. You should pass the " . - "original value returned by the previous query", "_badcontinue" ); - } + $this->dieContinueUsageIf( count( $cont ) != 1 ); $op = $params['dir'] == 'descending' ? '<' : '>'; $cont_from = $db->addQuotes( $cont[0] ); $this->addWhere( "cat_title $op= $cont_from" ); @@ -79,9 +76,8 @@ class ApiQueryAllCategories extends ApiQueryGeneratorBase { if ( $dir == 'newer' ) { $this->addWhereRange( 'cat_pages', 'newer', $min, $max ); } else { - $this->addWhereRange( 'cat_pages', 'older', $max, $min); + $this->addWhereRange( 'cat_pages', 'older', $max, $min ); } - if ( isset( $params['prefix'] ) ) { $this->addWhere( 'cat_title' . $db->buildLike( $this->titlePartToKey( $params['prefix'] ), $db->anyString() ) ); @@ -125,7 +121,7 @@ class ApiQueryAllCategories extends ApiQueryGeneratorBase { $pages[] = $titleObj; } else { $item = array(); - $result->setContent( $item, $titleObj->getText() ); + ApiResult::setContent( $item, $titleObj->getText() ); if ( isset( $prop['size'] ) ) { $item['size'] = intval( $row->cat_pages ); $item['pages'] = $row->cat_pages - $row->cat_subcats - $row->cat_files; @@ -225,12 +221,6 @@ class ApiQueryAllCategories extends ApiQueryGeneratorBase { return 'Enumerate all categories'; } - public function getPossibleErrors() { - return array_merge( parent::getPossibleErrors(), array( - array( 'code' => '_badcontinue', 'info' => 'Invalid continue param. You should pass the original value returned by the previous query' ), - ) ); - } - public function getExamples() { return array( 'api.php?action=query&list=allcategories&acprop=size', @@ -241,8 +231,4 @@ class ApiQueryAllCategories extends ApiQueryGeneratorBase { public function getHelpUrls() { return 'https://www.mediawiki.org/wiki/API:Allcategories'; } - - public function getVersion() { - return __CLASS__ . ': $Id$'; - } } |