Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/234403
Change subject: Remove static $subscriberCount from SpecialNewsletters
......................................................................
Remove static $subscriberCount from SpecialNewsletters
Change-Id: Ic5c4566f8cf411aa192aeb886948f66effb572ad
---
M includes/NewsletterTablePager.php
M includes/specials/SpecialNewsletters.php
2 files changed, 6 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Newsletter
refs/changes/03/234403/1
diff --git a/includes/NewsletterTablePager.php
b/includes/NewsletterTablePager.php
index ee8acbd..f8abb68 100644
--- a/includes/NewsletterTablePager.php
+++ b/includes/NewsletterTablePager.php
@@ -25,11 +25,15 @@
public function getQueryInfo() {
$info = array(
- 'tables' => array( 'nl_newsletters' ),
+ 'tables' => array( 'nl_newsletters', 'nl_subscriptions'
),
'fields' => array(
'nl_name',
'nl_desc',
'nl_id',
+ 'subscribers' => (
'COUNT(nl_subscriptions.newsletter_id)' ),
+ ),
+ 'join_conds' => array(
+ 'nl_subscriptions' => array( 'LEFT JOIN',
'newsletter_id = nl_id' ),
),
);
@@ -64,11 +68,7 @@
'type' => 'textbox',
'readonly' => 'true',
'id' => 'newsletter-' .
$this->mCurrentRow->nl_id,
- 'value' => in_array(
-
$this->mCurrentRow->nl_id,
-
SpecialNewsletters::$allSubscribedNewsletterId
- ) ?
-
SpecialNewsletters::$subscriberCount[$this->mCurrentRow->nl_id] : 0,
+ 'value' =>
$this->mCurrentRow->subscribers,
)
);
diff --git a/includes/specials/SpecialNewsletters.php
b/includes/specials/SpecialNewsletters.php
index 97e64d9..9775e38 100644
--- a/includes/specials/SpecialNewsletters.php
+++ b/includes/specials/SpecialNewsletters.php
@@ -22,13 +22,6 @@
*/
public static $subscribedNewsletterId = array();
- /**
- * Subscriber count
- * @var array
- * @todo FIXME this is called from other classes
- */
- public static $subscriberCount = array();
-
public function __construct() {
parent::__construct( 'Newsletters' );
self::getSubscribedNewsletters( $this->getUser()->getId() );
@@ -75,7 +68,6 @@
__METHOD__
);
self::$allSubscribedNewsletterId[] =
$row->newsletter_id;
- self::$subscriberCount[$row->newsletter_id] = $result;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/234403
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic5c4566f8cf411aa192aeb886948f66effb572ad
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: Addshore <addshorew...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
