Niedzielski has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/392571 )
Change subject: Fix: wiki and summary page title decoding
......................................................................
Fix: wiki and summary page title decoding
Wiki and summary page title decoding operates on URI segments not full
URIs. Replace mistaken calls to decodeURI() with decodeURIComponent().
Change-Id: I8d4183735ab0ae078b1620fe315d48b76ff54d33
---
M src/common/marshallers/page-base/page-base-unmarshaller.ts
M src/common/pages/summary.tsx
M src/common/pages/wiki.tsx
3 files changed, 3 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/marvin refs/changes/71/392571/1
diff --git a/src/common/marshallers/page-base/page-base-unmarshaller.ts
b/src/common/marshallers/page-base/page-base-unmarshaller.ts
index f3cbd2b..416499c 100644
--- a/src/common/marshallers/page-base/page-base-unmarshaller.ts
+++ b/src/common/marshallers/page-base/page-base-unmarshaller.ts
@@ -13,7 +13,7 @@
if (titlePath === undefined) {
throw new Error("titlePath should be known at response time.");
}
- return decodeURI(titlePath);
+ return decodeURIComponent(titlePath);
}
export const unmarshalPageGeolocation = (json: JSONObject): PageGeolocation =>
{
diff --git a/src/common/pages/summary.tsx b/src/common/pages/summary.tsx
index 4d9c1c3..cac2889 100644
--- a/src/common/pages/summary.tsx
+++ b/src/common/pages/summary.tsx
@@ -45,9 +45,7 @@
if (error instanceof RedirectError) {
error = new RedirectError(
error.status,
- summary.toPath({
- title: decodeURIComponent(unmarshalPageTitleID(error.url))
- })
+ summary.toPath({ title: unmarshalPageTitleID(error.url) })
);
}
throw error;
diff --git a/src/common/pages/wiki.tsx b/src/common/pages/wiki.tsx
index cf914e1..ef011b8 100644
--- a/src/common/pages/wiki.tsx
+++ b/src/common/pages/wiki.tsx
@@ -55,7 +55,7 @@
error = new RedirectError(
error.status,
wiki.toPath({
- title: decodeURIComponent(unmarshalPageTitleID(error.url)),
+ title: unmarshalPageTitleID(error.url),
revision: params.revision
})
);
--
To view, visit https://gerrit.wikimedia.org/r/392571
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8d4183735ab0ae078b1620fe315d48b76ff54d33
Gerrit-PatchSet: 1
Gerrit-Project: marvin
Gerrit-Branch: master
Gerrit-Owner: Niedzielski <[email protected]>
Gerrit-Reviewer: Sniedzielski <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
