Merge pull request EFForg#4189 from Hainish/fix-custom-ruleset-regression

jsha · jsha · commit 7cd6cff9b20d · 2016-02-19T22:48:29.000-08:00
Fix regression where custom rulesets are not loading into targets. (r…
diff --git a/src/chrome/content/code/HTTPSRules.js b/src/chrome/content/code/HTTPSRules.js
@@ -390,9 +390,10 @@ const HTTPSRules = {
       var t1 = new Date().getTime();
       this.checkMixedContentHandling();
       var rulefiles = RuleWriter.enumerate(RuleWriter.getCustomRuleDir());
-      this.scanRulefiles(rulefiles);
 
       this.loadTargets();
+      this.scanRulefiles(rulefiles);
+
     } catch(e) {
       this.log(DBUG,"Rules Failed: "+e);
     }
