From e11d10cfbb705eef649ddf265cc71d2bde14fd98 Mon Sep 17 00:00:00 2001 From: Doug Kearns Date: Sat, 9 Apr 2011 12:58:26 +1000 Subject: [PATCH] Fix timespan based sanitation of history items. Fixes issue 508. --- common/modules/sanitizer.jsm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/common/modules/sanitizer.jsm b/common/modules/sanitizer.jsm index 1a86c4ed..44924899 100644 --- a/common/modules/sanitizer.jsm +++ b/common/modules/sanitizer.jsm @@ -107,11 +107,13 @@ var Sanitizer = Module("sanitizer", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakRef action: function (range, host) { if (host) services.history.removePagesFromHost(host, true); - else - services.history.removeVisitsByTimeframe(range.min, range.max); - - if (!host) + else { + if (range.isEternity) + services.history.removeAllPages(); + else + services.history.removeVisitsByTimeframe(range.native[0], Math.min(Date.now() * 1000, range.native[1])); // XXX services.observer.notifyObservers(null, "browser:purge-session-history", ""); + } if (!host || util.isDomainURL(prefs.get("general.open_location.last_url"), host)) prefs.reset("general.open_location.last_url");