Bug 1161435 - netErrorURL should be resolved from start-manifest url. r=fabrice

This commit is contained in:
Paul Rouget 2015-05-15 06:18:04 +02:00
parent 912f2a95d1
commit d88d96093b

View File

@ -12,11 +12,11 @@ function debug(msg) {
}
function netErrorURL() {
let uri = "app://system.gaiamobile.org/net_error.html";
try {
uri = Services.prefs.getCharPref("b2g.neterror.url");
} catch(e) {}
return uri;
let systemManifestURL = Services.prefs.getCharPref("b2g.system_manifest_url");
systemManifestURL = Services.io.newURI(systemManifestURL, null, null);
let netErrorURL = Services.prefs.getCharPref("b2g.neterror.url");
netErrorURL = Services.io.newURI(netErrorURL, null, systemManifestURL);
return netErrorURL.spec;
}
let modules = {