| Index: trunk/extensions/SemanticWatchlist/api/ApiQuerySemanticWatchlist.php |
| — | — | @@ -41,7 +41,7 @@ |
| 42 | 42 | if ( ++$count > $params['limit'] ) { |
| 43 | 43 | // We've reached the one extra which shows that |
| 44 | 44 | // there are additional pages to be had. Stop here... |
| 45 | | - $this->setContinueEnumParameter( 'continue', $set->set_time . '-' . $set->set_id ); |
| | 45 | + $this->setContinueEnumParameter( 'continue', $set->edit_time . '-' . $set->spe_set_id ); |
| 46 | 46 | break; |
| 47 | 47 | } |
| 48 | 48 | |
| — | — | @@ -135,6 +135,10 @@ |
| 136 | 136 | ApiBase::PARAM_TYPE => 'integer', |
| 137 | 137 | ApiBase::PARAM_ISMULTI => true, |
| 138 | 138 | ), |
| | 139 | + 'merge' => array( |
| | 140 | + ApiBase::PARAM_TYPE => 'boolean', |
| | 141 | + ApiBase::PARAM_TYPE => false, |
| | 142 | + ), |
| 139 | 143 | 'limit' => array( |
| 140 | 144 | ApiBase :: PARAM_DFLT => 20, |
| 141 | 145 | ApiBase :: PARAM_TYPE => 'limit', |