jenkins-bot has submitted this change and it was merged. Change subject: Remove static $subscriberCount from SpecialNewsletters ......................................................................
Remove static $subscriberCount from SpecialNewsletters Change-Id: Ic5c4566f8cf411aa192aeb886948f66effb572ad --- M includes/NewsletterManageTablePager.php M includes/NewsletterTablePager.php M includes/specials/SpecialNewsletters.php 3 files changed, 7 insertions(+), 21 deletions(-) Approvals: 01tonythomas: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/NewsletterManageTablePager.php b/includes/NewsletterManageTablePager.php index 6abfe22..7a8c4b1 100644 --- a/includes/NewsletterManageTablePager.php +++ b/includes/NewsletterManageTablePager.php @@ -29,7 +29,7 @@ 'fields' => array( 'newsletter_id', 'publisher_id', - 'is_owner' => ( 'publisher_id = nl_owner_id' ), + 'is_owner' => 'publisher_id = nl_owner_id', ), 'join_conds' => array( 'nl_newsletters' => array( 'LEFT JOIN', 'newsletter_id = nl_id' ), 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..8f3a693 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() ); @@ -68,14 +61,7 @@ ); foreach ( $resl as $row ) { - $result = $dbr->selectRowCount( - 'nl_subscriptions', - array(), - array( 'newsletter_id' => $row->newsletter_id ), - __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: merged Gerrit-Change-Id: Ic5c4566f8cf411aa192aeb886948f66effb572ad Gerrit-PatchSet: 4 Gerrit-Project: mediawiki/extensions/Newsletter Gerrit-Branch: master Gerrit-Owner: Addshore <addshorew...@gmail.com> Gerrit-Reviewer: 01tonythomas <01tonytho...@gmail.com> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits