diff options
| author | Sam Reed <reedy@users.mediawiki.org> | 2010-01-19 17:23:31 +0000 |
|---|---|---|
| committer | Sam Reed <reedy@users.mediawiki.org> | 2010-01-19 17:23:31 +0000 |
| commit | 8cb4dda772cc892ca08d6486899019f78becb610 (patch) | |
| tree | 2e3fec06ed50d463754edee9613578b54d52c06a /includes | |
| parent | 1ff67403c85b898caa8cd9faaf42227cabb2d413 (diff) | |
| download | mediawikicore-8cb4dda772cc892ca08d6486899019f78becb610.tar.gz mediawikicore-8cb4dda772cc892ca08d6486899019f78becb610.zip | |
Move position of $prlevel array stripping, and check isset
action=query&list=allpages&apfrom=B&apprtype=edit
Gave
Warning: array_diff() [function.array-diff]: Argument #1 is not an array in /home/reedy/mediawiki/trunk/phase3/includes/api/ApiQueryAllpages.php on line 99
Notes
Notes:
http://mediawiki.org/wiki/Special:Code/MediaWiki/61259
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/api/ApiQueryAllpages.php | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/includes/api/ApiQueryAllpages.php b/includes/api/ApiQueryAllpages.php index 39bc360d53ac..4f8fe40dcad0 100644 --- a/includes/api/ApiQueryAllpages.php +++ b/includes/api/ApiQueryAllpages.php @@ -95,10 +95,13 @@ class ApiQueryAllpages extends ApiQueryGeneratorBase { $this->addWhere( 'pr_expiry>' . $db->addQuotes( $db->timestamp() ) ); $this->addWhereFld( 'pr_type', $params['prtype'] ); - // Remove the empty string and '*' from the prlevel array - $prlevel = array_diff( $params['prlevel'], array( '', '*' ) ); - if ( !empty( $prlevel ) ) - $this->addWhereFld( 'pr_level', $prlevel ); + if ( isset ( $params['prlevel'] ) ) { + // Remove the empty string and '*' from the prlevel array + $prlevel = array_diff( $params['prlevel'], array( '', '*' ) ); + + if ( !empty( $prlevel ) ) + $this->addWhereFld( 'pr_level', $prlevel ); + } if ( $params['prfiltercascade'] == 'cascading' ) $this->addWhereFld( 'pr_cascade', 1 ); else if ( $params['prfiltercascade'] == 'noncascading' ) |