* (bug 26882) Allow listing of indefinite protections with the api

Swap some !empty for count

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 4b603b3..28be438 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -346,6 +346,7 @@ PHP if you have not done so prior to upgrading MediaWiki.
 * YAML API output is now 1.2 compliant, using JSON as the formatter
 * (bug 28672) give information about misermode on api
 * (bug 28558) Add iw_api and iw_wikiid to meta=siteinfo&siprop=interwikimap
+* (bug 26882) Allow listing of indefinite protections with the api
 
 === Languages updated in 1.18 ===
 

diff --git a/includes/api/ApiQueryAllpages.php b/includes/api/ApiQueryAllpages.php
index a804fd5..7136778 100644 (file)
--- a/includes/api/ApiQueryAllpages.php
+++ b/includes/api/ApiQueryAllpages.php
@@ -111,30 +111,38 @@ class ApiQueryAllpages extends ApiQueryGeneratorBase {
                }
 
                // Page protection filtering
-               if ( !empty( $params['prtype'] ) ) {
+               if ( count( $params['prtype'] ) || $params['prexpiry'] != 'all' ) {
                        $this->addTables( 'page_restrictions' );
                        $this->addWhere( 'page_id=pr_page' );
                        $this->addWhere( 'pr_expiry>' . $db->addQuotes( $db->timestamp() ) );
-                       $this->addWhereFld( 'pr_type', $params['prtype'] );
 
-                       if ( isset( $params['prlevel'] ) ) {
-                               // Remove the empty string and '*' from the prlevel array
-                               $prlevel = array_diff( $params['prlevel'], array( '', '*' ) );
+                       if ( count( $params['prtype'] ) ) {
+                               $this->addWhereFld( 'pr_type', $params['prtype'] );
 
-                               if ( !empty( $prlevel ) ) {
-                                       $this->addWhereFld( 'pr_level', $prlevel );
-                               }
-                       }
-                       if ( $params['prfiltercascade'] == 'cascading' ) {
-                               $this->addWhereFld( 'pr_cascade', 1 );
-                       } elseif ( $params['prfiltercascade'] == 'noncascading' ) {
-                               $this->addWhereFld( 'pr_cascade', 0 );
-                       }
+                               if ( isset( $params['prlevel'] ) ) {
+                                       // Remove the empty string and '*' from the prlevel array
+                                       $prlevel = array_diff( $params['prlevel'], array( '', '*' ) );
 
-                       $this->addOption( 'DISTINCT' );
+                                       if ( count( $prlevel ) ) {
+                                               $this->addWhereFld( 'pr_level', $prlevel );
+                                       }
+                               }
+                               if ( $params['prfiltercascade'] == 'cascading' ) {
+                                       $this->addWhereFld( 'pr_cascade', 1 );
+                               } elseif ( $params['prfiltercascade'] == 'noncascading' ) {
+                                       $this->addWhereFld( 'pr_cascade', 0 );
+                               }
 
+                               $this->addOption( 'DISTINCT' );
+                       }
                        $forceNameTitleIndex = false;
 
+                       if ( $params['prexpiry'] == 'indefinite' ) {
+                               $this->addWhere( "pr_expiry = 'infinity' OR pr_expiry IS NULL" );
+                       } elseif ( $params['prexpiry'] == 'definite' ) {
+                               $this->addWhere( "pr_expiry != 'infinity'" );
+                       }
+
                } elseif ( isset( $params['prlevel'] ) ) {
                        $this->dieUsage( 'prlevel may not be used without prtype', 'params' );
                }
@@ -256,7 +264,15 @@ class ApiQueryAllpages extends ApiQueryGeneratorBase {
                                        'all'
                                ),
                                ApiBase::PARAM_DFLT => 'all'
-                       )
+                       ),
+                       'prexpiry' => array(
+                               ApiBase::PARAM_TYPE => array(
+                                       'indefinite',
+                                       'definite',
+                                       'all'
+                               ),
+                               ApiBase::PARAM_DFLT => 'all'
+                       ),
                );
        }
 
@@ -275,7 +291,13 @@ class ApiQueryAllpages extends ApiQueryGeneratorBase {
                        'prlevel' => "The protection level (must be used with {$p}prtype= parameter)",
                        'prfiltercascade' => "Filter protections based on cascadingness (ignored when {$p}prtype isn't set)",
                        'filterlanglinks' => 'Filter based on whether a page has langlinks',
-                       'limit' => 'How many total pages to return.'
+                       'limit' => 'How many total pages to return.',
+                       'prexpiry' => array(
+                               'Which protection expiry to filter the page on',
+                               ' indefinite - Get only pages with indefinite protection expiry',
+                               ' definite - Get only pages with a definite (specific) protection expiry',
+                               ' all - Get pages with any protections expiry'
+                       ),
                );
        }