jenkins-bot has submitted this change and it was merged.
Change subject: Use mw.util.getUrl instead of mw.util.wikiGetlink (deprecated)
......................................................................
Use mw.util.getUrl instead of mw.util.wikiGetlink (deprecated)
Change-Id: I72afbbd909ce2394d54f78d465bd8ad245c1694f
---
M VisualEditor.hooks.php
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
M modules/ve-mw/init/ve.init.mw.Target.js
4 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php
index 5a855fb..30584fa 100644
--- a/VisualEditor.hooks.php
+++ b/VisualEditor.hooks.php
@@ -20,7 +20,7 @@
// parties who attempt to install VisualEditor onto non-alpha
wikis, as
// this should have no impact on deploying to Wikimedia's wiki
cluster.
// Is fine for release tarballs because 1.22wmf11 < 1.22alpha <
1.22.0.
- wfUseMW( '1.22wmf11' );
+ wfUseMW( '1.23wmf2' );
// Add tab messages to the init init module
foreach ( $wgVisualEditorTabMessages as $msg ) {
diff --git a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
index 480c351..847e839 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
@@ -57,7 +57,7 @@
// BUG 49000: For special pages, no information about page existence is
// exposed to mw.config (see BUG 53774), so we assume it exists.
pageExists = !!mw.config.get( 'wgArticleId' ) || mw.config.get(
'wgNamespaceNumber' ) < 0;
- viewUri = new mw.Uri( mw.util.wikiGetlink( mw.config.get(
'wgRelevantPageName' ) ) );
+ viewUri = new mw.Uri( mw.util.getUrl( mw.config.get(
'wgRelevantPageName' ) ) );
veEditUri = viewUri.clone().extend( { 'veaction': 'edit' } );
isViewPage = (
mw.config.get( 'wgIsArticle' ) &&
diff --git a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
index 1ea1d1e..623e7d4 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
@@ -54,7 +54,7 @@
this.sectionPositionRestored = false;
this.sectionTitleRestored = false;
this.namespaceName = mw.config.get( 'wgCanonicalNamespace' );
- this.viewUri = new mw.Uri( mw.util.wikiGetlink( this.pageName ) );
+ this.viewUri = new mw.Uri( mw.util.getUrl( this.pageName ) );
this.veEditUri = this.viewUri.clone().extend( { 'veaction': 'edit' } );
this.isViewPage = (
mw.config.get( 'wgAction' ) === 'view' &&
diff --git a/modules/ve-mw/init/ve.init.mw.Target.js
b/modules/ve-mw/init/ve.init.mw.Target.js
index 53bfde6..7817c3e 100644
--- a/modules/ve-mw/init/ve.init.mw.Target.js
+++ b/modules/ve-mw/init/ve.init.mw.Target.js
@@ -33,7 +33,7 @@
this.restoring = !!revisionId;
this.editToken = mw.user.tokens.get( 'editToken' );
this.apiUrl = mw.util.wikiScript( 'api' );
- this.submitUrl = ( new mw.Uri( mw.util.wikiGetlink( this.pageName ) ) )
+ this.submitUrl = ( new mw.Uri( mw.util.getUrl( this.pageName ) ) )
.extend( { 'action': 'submit' } );
this.modules = [
--
To view, visit https://gerrit.wikimedia.org/r/94263
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I72afbbd909ce2394d54f78d465bd8ad245c1694f
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Krinkle <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Esanders <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
