jenkins-bot has submitted this change and it was merged.
Change subject: Correctly retrieve field names in TablePager classes
......................................................................
Correctly retrieve field names in TablePager classes
Previously every time this method was called
it would itterate over SpecialNewsletterManage::fields
I think it was trying to do something with static
but that is not needed / ugly and instead we can
just used a private field..
Change-Id: Iacedb588fa27de08784c7c0459ba77edb298ccd1
---
M includes/NewsletterManageTable.php
M includes/NewsletterTablePager.php
2 files changed, 20 insertions(+), 13 deletions(-)
Approvals:
01tonythomas: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/NewsletterManageTable.php
b/includes/NewsletterManageTable.php
index 3726721..68ae61e 100644
--- a/includes/NewsletterManageTable.php
+++ b/includes/NewsletterManageTable.php
@@ -4,17 +4,20 @@
private $newsletterOwners = array();
+ /**
+ * @see TablePager::getFieldnames
+ * @var array|null
+ */
+ private $fieldNames = null;
+
public function getFieldNames() {
- $header = null;
- if ( is_null( $header ) ) {
- $header = array();
+ if ( $this->fieldNames === null ) {
+ $this->fieldNames = array();
foreach ( SpecialNewsletterManage::$fields as $key =>
$value ) {
- $header[$key] = $this->msg(
"newsletter-manage-header-$value" )->text();
+ $this->fieldNames[$key] = $this->msg(
"newsletter-manage-header-$value" )->text();
}
}
-
- return $header;
-
+ return $this->fieldNames;
}
public function getQueryInfo() {
diff --git a/includes/NewsletterTablePager.php
b/includes/NewsletterTablePager.php
index f6cefa3..d4d2fad 100644
--- a/includes/NewsletterTablePager.php
+++ b/includes/NewsletterTablePager.php
@@ -2,16 +2,20 @@
class NewsletterTablePager extends TablePager {
+ /**
+ * @see TablePager::getFieldnames
+ * @var array|null
+ */
+ private $fieldNames = null;
+
public function getFieldNames() {
- static $headers = null;
- if ( is_null( $headers ) ) {
- $headers = array();
+ if ( $this->fieldNames === null ) {
+ $this->fieldNames = array();
foreach ( SpecialNewsletters::$fields as $field =>
$property ) {
- $headers[$field] = $this->msg(
"newsletter-header-$property" )->text();
+ $this->fieldNames[$field] = $this->msg(
"newsletter-header-$property" )->text();
}
}
-
- return $headers;
+ return $this->fieldNames;
}
public function getQueryInfo() {
--
To view, visit https://gerrit.wikimedia.org/r/234143
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iacedb588fa27de08784c7c0459ba77edb298ccd1
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
