From 5fcefed7417cd3580fc0779afb2793fac257d94b Mon Sep 17 00:00:00 2001
From: "lpsolit%gmail.com" <>
Date: Wed, 21 May 2008 05:00:57 +0000
Subject: Bug 380756: Remove duplicates.xul (and all the code related to it) -
 Patch by Frédéric Buclin <LpSolit@gmail.com> r=mkanat a=LpSolit
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Bugzilla/Install/Filesystem.pm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'Bugzilla')

diff --git a/Bugzilla/Install/Filesystem.pm b/Bugzilla/Install/Filesystem.pm
index c19cef403..8c6e7d52e 100644
--- a/Bugzilla/Install/Filesystem.pm
+++ b/Bugzilla/Install/Filesystem.pm
@@ -287,12 +287,8 @@ EOT
         # It's harmless if it isn't accessible...
         "$datadir/.htaccess" => { perms    => $ws_readable, contents => <<EOT
 # Nothing in this directory is retrievable unless overridden by an .htaccess
-# in a subdirectory; the only exception is duplicates.rdf, which is used by
-# duplicates.xul and must be accessible from the web server
+# in a subdirectory.
 deny from all
-<Files duplicates.rdf>
-  allow from all
-</Files>
 EOT
 
 
@@ -371,6 +367,11 @@ EOT
         unlink "$datadir/versioncache";
     }
 
+    if (-e "$datadir/duplicates.rdf") {
+        print "Removing duplicates.rdf...\n";
+        unlink "$datadir/duplicates.rdf";
+        unlink "$datadir/duplicates-old.rdf";
+    }
 }
 
 # A simple helper for creating "empty" CSS files.
-- 
cgit v1.2.3-24-g4f1b