Santhosh has uploaded a new change for review. https://gerrit.wikimedia.org/r/209679
Change subject: RESTBase URL: Use different placeholder name for title and lang ...................................................................... RESTBase URL: Use different placeholder name for title and lang Placeholders like $title can potentially cause conflicts with puppet variables. So using @title, @lang Follow up: https://gerrit.wikimedia.org/r/#/c/207039/ Bug: T92359 Change-Id: I3f8a939b44370606015668c29bb5fa1eb015f18c --- M config.defaults.js M pageloader/PageLoader.js 2 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/cxserver refs/changes/79/209679/1 diff --git a/config.defaults.js b/config.defaults.js index 911a480..5b2fdce 100644 --- a/config.defaults.js +++ b/config.defaults.js @@ -10,7 +10,7 @@ allowCORS: '*', // Parsoid API URL 'parsoid.api': 'http://parsoid-lb.eqiad.wikimedia.org', - 'restbase.url': 'https://$lang.wikipedia.org/api/rest_v1/page/html/$title', + 'restbase.url': 'https://@lang.wikipedia.org/api/rest_v1/page/html/@title', // Apertium web API URL 'mt.apertium.api': 'http://apertium.wmflabs.org', 'mt.yandex.api': 'https://translate.yandex.net', diff --git a/pageloader/PageLoader.js b/pageloader/PageLoader.js index 2f985ed..890d9d3 100644 --- a/pageloader/PageLoader.js +++ b/pageloader/PageLoader.js @@ -50,8 +50,8 @@ if ( conf( 'restbase.url' ) ) { url = conf( 'restbase.url' ) - .replace( '$lang', this.sourceLanguage ) - .replace( '$title', encodeURIComponent( this.page ) ); + .replace( '@lang', this.sourceLanguage ) + .replace( '@title', encodeURIComponent( this.page ) ); } else { url = conf( 'parsoid.api' ) + '/' + this.sourceLanguage + 'wiki/' + encodeURIComponent( this.page ); -- To view, visit https://gerrit.wikimedia.org/r/209679 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3f8a939b44370606015668c29bb5fa1eb015f18c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/cxserver Gerrit-Branch: master Gerrit-Owner: Santhosh <santhosh.thottin...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
