Merge pull request EFForg#255 from BugAndNewsReporter/master

diracdeltas · diracdeltas · commit e71a9643fbd8 · 2014-05-23T14:49:44.000-07:00
Fix allowing global installation of Firefox extension
diff --git a/src/chrome.manifest b/src/chrome.manifest
@@ -1,4 +1,5 @@
 content https-everywhere chrome/content/
+override chrome://https-everywhere/content/rulesets.sqlite defaults/rulesets.sqlite
 
 locale https-everywhere en chrome/locale/en/
 locale https-everywhere lt chrome/locale/lt/
diff --git a/src/chrome/content/code/HTTPSRules.js b/src/chrome/content/code/HTTPSRules.js
@@ -388,8 +388,7 @@ const HTTPSRules = {
       this.scanRulefiles(rulefiles);
 
       // Initialize database connection.
-      var dbFile = FileUtils.getFile("ProfD",
-        ["extensions", "https-everywhere@eff.org", "defaults", "rulesets.sqlite"]);
+      var dbFile = new FileUtils.File(RuleWriter.chromeToPath("chrome://https-everywhere/content/rulesets.sqlite"));
       var rulesetDBConn = Services.storage.openDatabase(dbFile);
       this.queryForRuleset = rulesetDBConn.createStatement(
         "select contents from rulesets where id = :id");

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`content https-everywhere chrome/content/`
	`2`	`+override chrome://https-everywhere/content/rulesets.sqlite defaults/rulesets.sqlite`
`2`	`3`
`3`	`4`	`locale https-everywhere en chrome/locale/en/`
`4`	`5`	`locale https-everywhere lt chrome/locale/lt/`