http://www.mediawiki.org/wiki/Special:Code/MediaWiki/88791

Revision: 88791
Author:   jeroendedauw
Date:     2011-05-25 14:21:26 +0000 (Wed, 25 May 2011)
Log Message:
-----------
fixed bug in continue param caused by earlier refactoring

Modified Paths:
--------------
    trunk/extensions/SemanticWatchlist/api/ApiQuerySemanticWatchlist.php

Modified: trunk/extensions/SemanticWatchlist/api/ApiQuerySemanticWatchlist.php
===================================================================
--- trunk/extensions/SemanticWatchlist/api/ApiQuerySemanticWatchlist.php        
2011-05-25 14:16:21 UTC (rev 88790)
+++ trunk/extensions/SemanticWatchlist/api/ApiQuerySemanticWatchlist.php        
2011-05-25 14:21:26 UTC (rev 88791)
@@ -41,7 +41,7 @@
                        if ( ++$count > $params['limit'] ) {
                                // We've reached the one extra which shows that
                                // there are additional pages to be had. Stop 
here...
-                               $this->setContinueEnumParameter( 'continue', 
$set->set_time . '-' . $set->set_id );
+                               $this->setContinueEnumParameter( 'continue', 
$set->edit_time . '-' . $set->spe_set_id );
                                break;
                        }
                        
@@ -135,6 +135,10 @@
                                ApiBase::PARAM_TYPE => 'integer',
                                ApiBase::PARAM_ISMULTI => true,
                        ),
+                       'merge' => array(
+                               ApiBase::PARAM_TYPE => 'boolean',
+                               ApiBase::PARAM_TYPE => false,
+                       ),
                        'limit' => array(
                                ApiBase :: PARAM_DFLT => 20,
                                ApiBase :: PARAM_TYPE => 'limit',


_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to