summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-07-06 10:22:24 +0200
committerwolfbeast <mcwerewolf@gmail.com>2018-07-06 10:22:24 +0200
commitb94e5a3a4a3088a96db7166c244721d230845231 (patch)
tree0a853e637c7ba56863900e8ddc9d23ff21126de1
parent52d608c670c5c485cfe1139c40ec06d8ef460a26 (diff)
downloadUXP-b94e5a3a4a3088a96db7166c244721d230845231.tar
UXP-b94e5a3a4a3088a96db7166c244721d230845231.tar.gz
UXP-b94e5a3a4a3088a96db7166c244721d230845231.tar.lz
UXP-b94e5a3a4a3088a96db7166c244721d230845231.tar.xz
UXP-b94e5a3a4a3088a96db7166c244721d230845231.zip
Fix redirector paths
This resolves #602.
-rw-r--r--application/palemoon/components/about/AboutRedirector.cpp7
-rw-r--r--toolkit/content/jar.mn2
2 files changed, 2 insertions, 7 deletions
diff --git a/application/palemoon/components/about/AboutRedirector.cpp b/application/palemoon/components/about/AboutRedirector.cpp
index 508202c7d..fbcad6094 100644
--- a/application/palemoon/components/about/AboutRedirector.cpp
+++ b/application/palemoon/components/about/AboutRedirector.cpp
@@ -70,12 +70,7 @@ static RedirEntry kRedirMap[] = {
nsIAboutModule::ALLOW_SCRIPT
},
{
- "rights",
-#ifdef MOZ_OFFICIAL_BRANDING
- "chrome://global/content/aboutRights.xhtml",
-#else
- "chrome://global/content/aboutRights-unbranded.xhtml",
-#endif
+ "rights", "chrome://global/content/aboutRights.xhtml",
nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
nsIAboutModule::MAKE_LINKABLE |
nsIAboutModule::ALLOW_SCRIPT
diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
index 0c0f9494a..e1d432cb3 100644
--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
@@ -12,7 +12,7 @@ toolkit.jar:
content/global/about.xhtml
content/global/aboutAbout.js
content/global/aboutAbout.xhtml
-#ifdef MC_OFFICIAL
+#ifdef MOZ_OFFICIAL_BRANDING
* content/global/aboutRights.xhtml
#else
* content/global/aboutRights.xhtml (aboutRights-unbranded.xhtml)