https://www.mediawiki.org/wiki/Special:Code/MediaWiki/112161
Revision: 112161
Author: emsmith
Date: 2012-02-22 23:15:21 +0000 (Wed, 22 Feb 2012)
Log Message:
-----------
bug 34090 - fix limit and use old continue to determine if we do the header
Modified Paths:
--------------
trunk/extensions/ArticleFeedbackv5/api/ApiViewActivityArticleFeedbackv5.php
Modified:
trunk/extensions/ArticleFeedbackv5/api/ApiViewActivityArticleFeedbackv5.php
===================================================================
--- trunk/extensions/ArticleFeedbackv5/api/ApiViewActivityArticleFeedbackv5.php
2012-02-22 23:07:11 UTC (rev 112160)
+++ trunk/extensions/ArticleFeedbackv5/api/ApiViewActivityArticleFeedbackv5.php
2012-02-22 23:15:21 UTC (rev 112161)
@@ -59,6 +59,7 @@
// get our activities
$activities = $this->fetchActivity( $title, $feedbackId,
$limit, $continue);
+ $old_continue = $continue;
// overwrite previous continue for new value
$continue = null;
@@ -67,7 +68,7 @@
$html = '';
// only do this if continue < 1
- if ($continue < 1) {
+ if ($old_continue < 1) {
// <div class="articleFeedbackv5-activity-pane">
$html .= Html::openElement( 'div', array(
'class' => 'articleFeedbackv5-activity-pane'
@@ -277,8 +278,8 @@
$where,
__METHOD__,
array(
- 'LIMIT' => ($limit + 1),
- 'ORDER BY' => 'log_timestamp DESC'
+ 'LIMIT' => $limit,
+ 'ORDER BY' => 'log_timestamp DESC, log_id ASC'
)
);
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
