--- nsImgLikeOpera-0.js    2008-10-14 11:59:48.000000000 +0300
+++ nsImgLikeOpera-1.js    2009-12-21 18:27:12.369957724 +0200
@@ -83,7 +83,7 @@
     expirationTime: 0,
     defaultPolicy: 3,
     tabsRefresh: false,
-    policyPattrens: '',
+    policyPatterns: '',
     flashBlock: false,
     loadLinkedImages: 0,
     delayLoad: 0,
@@ -262,7 +262,7 @@
     try { this.settings.flashBlock       = this.prefBranch.getBoolPref("flash.block");} catch(ex) {}
     try { this.settings.loadLinkedImages = this.prefBranch.getIntPref("load.linked.images");} catch(ex) {}
     try { this.settings.delayLoad        = this.prefBranch.getIntPref("delay.load");} catch(ex) {}
-    try { this.settings.policyPattrens   = this.createPatternsArray(this.prefBranch.getCharPref("policy.patterns"));} catch(ex) {}
+    try { this.settings.policyPatterns   = this.createPatternsArray(this.prefBranch.getCharPref("policy.patterns"));} catch(ex) {}
     try { this.settings.passCache        = this.prefBranch.getBoolPref("pass.cache");} catch(ex) {}
     try { this.settings.phwidth          = this.prefBranch.getIntPref("pholder.width");} catch(ex) {}
     try { this.settings.phheight         = this.prefBranch.getIntPref("pholder.height");} catch(ex) {}
@@ -511,7 +511,7 @@
 
     switch (docPolicy) {
       case 2:
-        passIt = this.settings.passCache && !expire || this.isThirdPartyHost(doc.location.host, contentLocation.host);
+        passIt = this.settings.passCache && !expire || !this.isThirdPartyHost(doc.location.host, contentLocation.host);
         break;
       
       case 3:
@@ -536,12 +536,33 @@
   },
 
   isThirdPartyHost: function(aHostA, aHostB) {
-    var res;
-    try
-    { 
-      res=aHostA && aHostB && (aHostA.indexOf(aHostB)==0);
-    } catch (e) {res=false;}
-    return res;
+    var _isThirdPartyHost;
+    
+    if ("nsIEffectiveTLDService" in Ci) {
+      var effectiveTLD = Cc["@mozilla.org/network/effective-tld-service;1"].getService(Ci.nsIEffectiveTLDService);
+      _isThirdPartyHost = function(aHostA, aHostB) {
+        return effectiveTLD.getBaseDomainFromHost(aHostA) !=
+               effectiveTLD.getBaseDomainFromHost(aHostB);
+      }
+    } else {
+      _isThirdPartyHost = function(aHostA, aHostB) {
+        return aHostA.replace(/.*?((?:[^.]+\.)?[^.]+\.?)$/, "$1") !=
+               aHostB.replace(/.*?((?:[^.]+\.)?[^.]+\.?)$/, "$1");
+      }
+    }
+    
+    return function(aHostA, aHostB) {
+      if (aHostA == aHostB)
+        return false;
+      
+      if (aHostA && aHostB) {
+        try {
+          return _isThirdPartyHost(aHostA, aHostB);
+        } catch(e) {}
+      }
+      
+      return true;
+    }
   },
   
   blockObj: function(obj, contentType) {
@@ -728,7 +749,7 @@
   },
   
   getPolicyFromFilters: function(docLocation, url) {
-    var policy, patts = this.settings.policyPattrens;
+    var policy, patts = this.settings.policyPatterns;
     for (var i=0; i<patts.length; i++) {
       if (patts[i][0].test(docLocation) || patts[i][0].test(url)) {
         policy = patts[i][1];

--- nsImgLikeOpera-0.js    2008-10-14 11:59:48.000000000 +0300
+++ nsImgLikeOpera-1.js    2009-12-22 13:56:17.306031929 +0200
@@ -83,7 +83,7 @@
     expirationTime: 0,
     defaultPolicy: 3,
     tabsRefresh: false,
-    policyPattrens: '',
+    policyPatterns: '',
     flashBlock: false,
     loadLinkedImages: 0,
     delayLoad: 0,
@@ -262,7 +262,7 @@
     try { this.settings.flashBlock       = this.prefBranch.getBoolPref("flash.block");} catch(ex) {}
     try { this.settings.loadLinkedImages = this.prefBranch.getIntPref("load.linked.images");} catch(ex) {}
     try { this.settings.delayLoad        = this.prefBranch.getIntPref("delay.load");} catch(ex) {}
-    try { this.settings.policyPattrens   = this.createPatternsArray(this.prefBranch.getCharPref("policy.patterns"));} catch(ex) {}
+    try { this.settings.policyPatterns   = this.createPatternsArray(this.prefBranch.getCharPref("policy.patterns"));} catch(ex) {}
     try { this.settings.passCache        = this.prefBranch.getBoolPref("pass.cache");} catch(ex) {}
     try { this.settings.phwidth          = this.prefBranch.getIntPref("pholder.width");} catch(ex) {}
     try { this.settings.phheight         = this.prefBranch.getIntPref("pholder.height");} catch(ex) {}
@@ -511,7 +511,7 @@
 
     switch (docPolicy) {
       case 2:
-        passIt = this.settings.passCache && !expire || this.isThirdPartyHost(doc.location.host, contentLocation.host);
+        passIt = this.settings.passCache && !expire || !this.isThirdPartyHost(doc.location.host, contentLocation.host);
         break;
       
       case 3:
@@ -536,12 +536,17 @@
   },
 
   isThirdPartyHost: function(aHostA, aHostB) {
-    var res;
-    try
-    { 
-      res=aHostA && aHostB && (aHostA.indexOf(aHostB)==0);
-    } catch (e) {res=false;}
-    return res;
+
+    if (aHostA == aHostB) {return false;}
+
+    try {
+      var tld=Components.classes["@mozilla.org/network/effective-tld-service;1"].getService(Components.interfaces.nsIEffectiveTLDService);
+      return aHostA && aHostB && tld.getBaseDomainFromHost(aHostA) != tld.getBaseDomainFromHost(aHostB);
+//       return aHostA.replace(/.*?((?:[^.]+\.)?[^.]+\.?)$/, "$1") !=
+//              aHostB.replace(/.*?((?:[^.]+\.)?[^.]+\.?)$/, "$1");
+    }
+    catch(err) {return false;}
+
   },
   
   blockObj: function(obj, contentType) {
@@ -728,7 +733,7 @@
   },
   
   getPolicyFromFilters: function(docLocation, url) {
-    var policy, patts = this.settings.policyPattrens;
+    var policy, patts = this.settings.policyPatterns;
     for (var i=0; i<patts.length; i++) {
       if (patts[i][0].test(docLocation) || patts[i][0].test(url)) {
         policy = patts[i][1];