Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/59991
Change subject: No need to cache lb's, they're cached in LBFactory classes
already.
......................................................................
No need to cache lb's, they're cached in LBFactory classes already.
Meanwhile also moved 2 lined of JS to _after_ execution of the onsuccess
callback
Change-Id: Ib7efb437eafcdedd78aad4a4eb3af4339b0366df
---
M ArticleFeedbackv5.backend.LBFactory.php
M data/DataModelBackend.LBFactory.php
M modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
3 files changed, 14 insertions(+), 27 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticleFeedbackv5
refs/changes/91/59991/1
diff --git a/ArticleFeedbackv5.backend.LBFactory.php
b/ArticleFeedbackv5.backend.LBFactory.php
index a7144c8..a9d2dea 100644
--- a/ArticleFeedbackv5.backend.LBFactory.php
+++ b/ArticleFeedbackv5.backend.LBFactory.php
@@ -16,18 +16,14 @@
* @return LoadBalancer
*/
public function getLB( $wiki = false ) {
- if ( !isset( static::$lb[$wiki] ) ) {
- global $wgArticleFeedbackv5Cluster;
+ global $wgArticleFeedbackv5Cluster;
- // connect to external, aft-specific, cluster
- if ( $wgArticleFeedbackv5Cluster ) {
- static::$lb[$wiki] =
wfGetLBFactory()->getExternalLB( $wgArticleFeedbackv5Cluster, $wiki );
- } else {
- static::$lb[$wiki] = parent::getLB( $wiki );
- }
+ // connect to external, aft-specific, cluster
+ if ( $wgArticleFeedbackv5Cluster ) {
+ return wfGetLBFactory()->getExternalLB(
$wgArticleFeedbackv5Cluster, $wiki );
+ } else {
+ return parent::getLB( $wiki );
}
-
- return static::$lb[$wiki];
}
/**
diff --git a/data/DataModelBackend.LBFactory.php
b/data/DataModelBackend.LBFactory.php
index c6bd8c7..fb59fa1 100644
--- a/data/DataModelBackend.LBFactory.php
+++ b/data/DataModelBackend.LBFactory.php
@@ -10,11 +10,6 @@
*/
class DataModelBackendLBFactory extends DataModelBackend {
/**
- * @var array [LoadBalancer]
- */
- protected static $lb = array();
-
- /**
* @var array [bool]
*/
protected static $written = array();
@@ -24,11 +19,7 @@
* @return LoadBalancer
*/
public function getLB( $wiki = false ) {
- if ( !isset( static::$lb[$wiki] ) ) {
- static::$lb[$wiki] = wfGetLB( $wiki );
- }
-
- return static::$lb[$wiki];
+ return wfGetLB( $wiki );
}
/**
@@ -48,7 +39,7 @@
if ( $db === DB_MASTER ) {
// mark that we're writing data
static::$written[$wiki] = true;
- } elseif ( isset(static::$written[$wiki]) &&
static::$written[$wiki] ) {
+ } elseif ( isset( static::$written[$wiki] ) &&
static::$written[$wiki] ) {
if ( $db === DB_SLAVE ) {
/*
* Let's keep querying master to make sure we
have up-to-date
diff --git
a/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
b/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
index 55fef3b..bbf7bdb 100644
--- a/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
+++ b/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
@@ -704,12 +704,6 @@
$(
'.articleFeedbackv5-feedback[data-id='+id+']' )
.replaceWith(
data.render );
- // re-mark active flags in
reader tools
-
$.articleFeedbackv5special.markActiveFlags( id );
-
- // re-bind panels (tipsies)
-
$.articleFeedbackv5special.bindTipsies( id );
-
// invoke the registered
onSuccess callback for the executed action
if ( data.result === 'Success'
) {
if ( 'onSuccess' in
$.articleFeedbackv5special.actions[action] ) {
@@ -726,6 +720,12 @@
$(
'.articleFeedbackv5-feedback[data-id='+id+'] .articleFeedbackv5-feedback-tools'
)
.append( '<p
class="articleFeedbackv5-form-toolbox-error">' + errorMessage + '</p>' );
}
+
+ // re-mark active flags in
reader tools
+
$.articleFeedbackv5special.markActiveFlags( id );
+
+ // re-bind panels (tipsies)
+
$.articleFeedbackv5special.bindTipsies( id );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/59991
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib7efb437eafcdedd78aad4a4eb3af4339b0366df
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticleFeedbackv5
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
