[MediaWiki-commits] [Gerrit] Slim down wbCurrentSite to only hold information we need - change (mediawiki...Wikibase)

2014-02-10 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Slim down wbCurrentSite to only hold information we need
..


Slim down wbCurrentSite to only hold information we need

Also removed some old temporary caching code

Change-Id: I6eb37bcc8641d712f686a927d6a6387a28abae8f
---
M client/includes/modules/SiteModule.php
M client/resources/jquery.wikibase/jquery.wikibase.linkitem.js
2 files changed, 3 insertions(+), 10 deletions(-)

Approvals:
  Aude: Looks good to me, approved
  WikidataJenkins: Verified
  Jeroen De Dauw: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/client/includes/modules/SiteModule.php 
b/client/includes/modules/SiteModule.php
index c07915a..e2933cb 100644
--- a/client/includes/modules/SiteModule.php
+++ b/client/includes/modules/SiteModule.php
@@ -5,7 +5,7 @@
 use ResourceLoaderModule;
 use ResourceLoaderContext;
 use MediaWikiSite;
-use Sites;
+use SiteSQLStore;
 use Wikibase\Client\WikibaseClient;
 
 /**
@@ -32,14 +32,11 @@
/**
 * @var MediaWikiSite $site
 */
-   $site = Sites::singleton()->getSite( Settings::get( 
'siteGlobalID' ) );
+   $site = SiteSQLStore::newInstance()->getSite( Settings::get( 
'siteGlobalID' ) );
 
$currentSite = array();
if ( $site ) {
-   $languageName = Utils::fetchLanguageName( 
$site->getLanguageCode() );
$currentSite = array(
-   'shortName' => $languageName,
-   'name' => $languageName,
'globalSiteId' => $site->getGlobalId(),
'languageCode' => $site->getLanguageCode(),
'langLinkSiteGroup' => 
WikibaseClient::getDefaultInstance()->getLangLinkSiteGroup()
diff --git a/client/resources/jquery.wikibase/jquery.wikibase.linkitem.js 
b/client/resources/jquery.wikibase/jquery.wikibase.linkitem.js
index 85db4fe..81c8ba5 100644
--- a/client/resources/jquery.wikibase/jquery.wikibase.linkitem.js
+++ b/client/resources/jquery.wikibase/jquery.wikibase.linkitem.js
@@ -81,11 +81,7 @@
globalSiteId: mw.config.get( 'wbCurrentSite' ).globalSiteId,
namespaceNumber: mw.config.get( 'wgNamespaceNumber' ),
repoArticlePath: mw.config.get( 'wbRepoUrl' ) + mw.config.get( 
'wbRepoArticlePath' ),
-   langLinkSiteGroup:
-   mw.config.get( 'wbCurrentSite' ).langLinkSiteGroup
-   // Fallback to the site group of the current site in 
case .langLinkSiteGroup isn't yet
-   // in the cache:
-   || wb.getSite( mw.config.get( 'wbCurrentSite' 
).globalSiteId ).getGroup()
+   langLinkSiteGroup: mw.config.get( 'wbCurrentSite' 
).langLinkSiteGroup
},
 
/**

-- 
To view, visit https://gerrit.wikimedia.org/r/106226
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6eb37bcc8641d712f686a927d6a6387a28abae8f
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Adrian Lang 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: Henning Snater 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: Jeroen De Dauw 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: WikidataJenkins 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Slim down wbCurrentSite to only hold information we need - change (mediawiki...Wikibase)

2014-01-08 Thread Hoo man (Code Review) 
Hoo man has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/106226


Change subject: Slim down wbCurrentSite to only hold information we need
..

Slim down wbCurrentSite to only hold information we need

Also removed some old temporary caching code.

Change-Id: I6eb37bcc8641d712f686a927d6a6387a28abae8f
---
M client/includes/modules/SiteModule.php
M client/resources/jquery.wikibase/jquery.wikibase.linkitem.js
2 files changed, 3 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/26/106226/1

diff --git a/client/includes/modules/SiteModule.php 
b/client/includes/modules/SiteModule.php
index 9653ccb..e2933cb 100644
--- a/client/includes/modules/SiteModule.php
+++ b/client/includes/modules/SiteModule.php
@@ -5,8 +5,7 @@
 use ResourceLoaderModule;
 use ResourceLoaderContext;
 use MediaWikiSite;
-use Site;
-use Sites;
+use SiteSQLStore;
 use Wikibase\Client\WikibaseClient;
 
 /**
@@ -33,14 +32,11 @@
/**
 * @var MediaWikiSite $site
 */
-   $site = Sites::singleton()->getSite( Settings::get( 
'siteGlobalID' ) );
+   $site = SiteSQLStore::newInstance()->getSite( Settings::get( 
'siteGlobalID' ) );
 
$currentSite = array();
if ( $site ) {
-   $languageName = Utils::fetchLanguageName( 
$site->getLanguageCode() );
$currentSite = array(
-   'shortName' => $languageName,
-   'name' => $languageName,
'globalSiteId' => $site->getGlobalId(),
'languageCode' => $site->getLanguageCode(),
'langLinkSiteGroup' => 
WikibaseClient::getDefaultInstance()->getLangLinkSiteGroup()
diff --git a/client/resources/jquery.wikibase/jquery.wikibase.linkitem.js 
b/client/resources/jquery.wikibase/jquery.wikibase.linkitem.js
index 85db4fe..81c8ba5 100644
--- a/client/resources/jquery.wikibase/jquery.wikibase.linkitem.js
+++ b/client/resources/jquery.wikibase/jquery.wikibase.linkitem.js
@@ -81,11 +81,7 @@
globalSiteId: mw.config.get( 'wbCurrentSite' ).globalSiteId,
namespaceNumber: mw.config.get( 'wgNamespaceNumber' ),
repoArticlePath: mw.config.get( 'wbRepoUrl' ) + mw.config.get( 
'wbRepoArticlePath' ),
-   langLinkSiteGroup:
-   mw.config.get( 'wbCurrentSite' ).langLinkSiteGroup
-   // Fallback to the site group of the current site in 
case .langLinkSiteGroup isn't yet
-   // in the cache:
-   || wb.getSite( mw.config.get( 'wbCurrentSite' 
).globalSiteId ).getGroup()
+   langLinkSiteGroup: mw.config.get( 'wbCurrentSite' 
).langLinkSiteGroup
},
 
/**

-- 
To view, visit https://gerrit.wikimedia.org/r/106226
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6eb37bcc8641d712f686a927d6a6387a28abae8f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits