match setup script to .htaccess from repo

diff --git a/lib/setup.php b/lib/setup.php
index 61ed6d78ae4322e8143aeb3e2eb6892e7a9c85da..1929256b6ce7af81365d0d0ff5e1e024b95b4fcb 100644 (file)
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -324,8 +324,6 @@ class OC_Setup {
                $content.= "RewriteRule ^.well-known/caldav /remote.php/caldav/ [R]\n";
                $content.= "RewriteRule ^apps/([^/]*)/(.*\.(css|php))$ index.php?app=$1&getfile=$2 [QSA,L]\n";
                $content.= "RewriteRule ^remote/(.*) remote.php [QSA,L]\n";
-               $content.= "RewriteRule ^.well-known/carddav /apps/contacts/carddav.php [R]\n";
-               $content.= "RewriteRule ^.well-known/caldav /apps/calendar/caldav.php [R]\n";
                $content.= "</IfModule>\n";
                $content.= "Options -Indexes\n";
                @file_put_contents(OC::$SERVERROOT.'/.htaccess', $content); //supress errors in case we don't have permissions for it