[MediaWiki-commits] [Gerrit] A few fixes and reverts for the last change - change (mediawiki...ExternalData)
Yaron Koren has uploaded a new change for review.
https://gerrit.wikimedia.org/r/104744
Change subject: A few fixes and reverts for the last change
..
A few fixes and reverts for the last change
Change-Id: I563037f23b58f898d8c4bbcdd6a26fd713934aa0
---
M ED_ParserFunctions.php
M ED_Utils.php
2 files changed, 15 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ExternalData
refs/changes/44/104744/1
diff --git a/ED_ParserFunctions.php b/ED_ParserFunctions.php
index 550cbcc..c8e09f8 100644
--- a/ED_ParserFunctions.php
+++ b/ED_ParserFunctions.php
@@ -265,9 +265,9 @@
* Render the #external_value parser function
*/
static function doExternalValue( $parser, $local_var = '' ) {
- global $edgValues, $edgSuppressNoLocalVarMsg;
+ global $edgValues;
if ( ! array_key_exists( $local_var, $edgValues ) ) {
- return $edgSuppressNoLocalVarMsg ? '' : Error: no
local variable \$local_var\ was set.;
+ return Error: no local variable \$local_var\ was
set.;
} elseif ( is_array( $edgValues[$local_var] ) ) {
return $edgValues[$local_var][0];
} else {
diff --git a/ED_Utils.php b/ED_Utils.php
index 5cc28ec..5bf569e 100644
--- a/ED_Utils.php
+++ b/ED_Utils.php
@@ -288,16 +288,16 @@
static function getMongoDBData( $db_server, $db_username, $db_password,
$db_name, $from, $columns, $where, $sqlOptions, $otherParams ) {
global $wgMainCacheType, $wgMemc, $edgMemCachedMongoDBSeconds;
-// use MEMCACHED if configured to cache mongodb queries
-if ($wgMainCacheType === CACHE_MEMCACHED
$edgMemCachedMongoDBSeconds 0) {
- // check if cache entry exists
- $mckey = wfMemcKey( 'mongodb', $from,
md5(json_encode($otherParams) . json_encode($columns) . $where .
json_encode($sqlOptions) . $db_name . $db_server));
- $values = $wgMemc-get( $mckey );
+ // Use MEMCACHED if configured to cache mongodb queries.
+ if ($wgMainCacheType === CACHE_MEMCACHED
$edgMemCachedMongoDBSeconds 0) {
+ // Check if cache entry exists.
+ $mckey = wfMemcKey( 'mongodb', $from,
md5(json_encode($otherParams) . json_encode($columns) . $where .
json_encode($sqlOptions) . $db_name . $db_server));
+ $values = $wgMemc-get( $mckey );
- if ($values !== false) {
- return $values;
- }
-}
+ if ($values !== false) {
+ return $values;
+ }
+ }
// MongoDB login is done using a single string.
// When specifying extra connect string options (e.g.
replicasets,timeout, etc.),
@@ -325,9 +325,9 @@
$db = $m-selectDB( $db_name );
// Check if collection exists
- if ($db-system-namespaces-findOne(array('name'=$db_name .
. . $from)) === null){
-return wfMessage( externaldata-db-unknown-collection:)-text() .
$db_name . . . $from;
-}
+ if ( $db-system-namespaces-findOne( array( 'name'=$db_name
. . . $from ) ) === null ){
+ return wfMessage(
externaldata-db-unknown-collection:)-text() . $db_name . . . $from;
+ }
$collection = new MongoCollection( $db, $from );
@@ -447,7 +447,7 @@
}
if ($wgMainCacheType === CACHE_MEMCACHED
$edgMemCachedMongoDBSeconds 0 ) {
- $wgMemc-set( $mckey, $values,
$edgMemCachedMongoDBSeconds );
+ $wgMemc-set( $mckey, $values,
$edgMemCachedMongoDBSeconds );
}
return $values;
--
To view, visit https://gerrit.wikimedia.org/r/104744
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I563037f23b58f898d8c4bbcdd6a26fd713934aa0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ExternalData
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren yaro...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] A few fixes and reverts for the last change - change (mediawiki...ExternalData)
Yaron Koren has submitted this change and it was merged.
Change subject: A few fixes and reverts for the last change
..
A few fixes and reverts for the last change
Change-Id: I563037f23b58f898d8c4bbcdd6a26fd713934aa0
---
M ED_ParserFunctions.php
M ED_Utils.php
2 files changed, 15 insertions(+), 15 deletions(-)
Approvals:
Yaron Koren: Verified; Looks good to me, approved
diff --git a/ED_ParserFunctions.php b/ED_ParserFunctions.php
index 550cbcc..c8e09f8 100644
--- a/ED_ParserFunctions.php
+++ b/ED_ParserFunctions.php
@@ -265,9 +265,9 @@
* Render the #external_value parser function
*/
static function doExternalValue( $parser, $local_var = '' ) {
- global $edgValues, $edgSuppressNoLocalVarMsg;
+ global $edgValues;
if ( ! array_key_exists( $local_var, $edgValues ) ) {
- return $edgSuppressNoLocalVarMsg ? '' : Error: no
local variable \$local_var\ was set.;
+ return Error: no local variable \$local_var\ was
set.;
} elseif ( is_array( $edgValues[$local_var] ) ) {
return $edgValues[$local_var][0];
} else {
diff --git a/ED_Utils.php b/ED_Utils.php
index 5cc28ec..5bf569e 100644
--- a/ED_Utils.php
+++ b/ED_Utils.php
@@ -288,16 +288,16 @@
static function getMongoDBData( $db_server, $db_username, $db_password,
$db_name, $from, $columns, $where, $sqlOptions, $otherParams ) {
global $wgMainCacheType, $wgMemc, $edgMemCachedMongoDBSeconds;
-// use MEMCACHED if configured to cache mongodb queries
-if ($wgMainCacheType === CACHE_MEMCACHED
$edgMemCachedMongoDBSeconds 0) {
- // check if cache entry exists
- $mckey = wfMemcKey( 'mongodb', $from,
md5(json_encode($otherParams) . json_encode($columns) . $where .
json_encode($sqlOptions) . $db_name . $db_server));
- $values = $wgMemc-get( $mckey );
+ // Use MEMCACHED if configured to cache mongodb queries.
+ if ($wgMainCacheType === CACHE_MEMCACHED
$edgMemCachedMongoDBSeconds 0) {
+ // Check if cache entry exists.
+ $mckey = wfMemcKey( 'mongodb', $from,
md5(json_encode($otherParams) . json_encode($columns) . $where .
json_encode($sqlOptions) . $db_name . $db_server));
+ $values = $wgMemc-get( $mckey );
- if ($values !== false) {
- return $values;
- }
-}
+ if ($values !== false) {
+ return $values;
+ }
+ }
// MongoDB login is done using a single string.
// When specifying extra connect string options (e.g.
replicasets,timeout, etc.),
@@ -325,9 +325,9 @@
$db = $m-selectDB( $db_name );
// Check if collection exists
- if ($db-system-namespaces-findOne(array('name'=$db_name .
. . $from)) === null){
-return wfMessage( externaldata-db-unknown-collection:)-text() .
$db_name . . . $from;
-}
+ if ( $db-system-namespaces-findOne( array( 'name'=$db_name
. . . $from ) ) === null ){
+ return wfMessage(
externaldata-db-unknown-collection:)-text() . $db_name . . . $from;
+ }
$collection = new MongoCollection( $db, $from );
@@ -447,7 +447,7 @@
}
if ($wgMainCacheType === CACHE_MEMCACHED
$edgMemCachedMongoDBSeconds 0 ) {
- $wgMemc-set( $mckey, $values,
$edgMemCachedMongoDBSeconds );
+ $wgMemc-set( $mckey, $values,
$edgMemCachedMongoDBSeconds );
}
return $values;
--
To view, visit https://gerrit.wikimedia.org/r/104744
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I563037f23b58f898d8c4bbcdd6a26fd713934aa0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ExternalData
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren yaro...@gmail.com
Gerrit-Reviewer: Yaron Koren yaro...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
