Bug fix: correct clean url behavior

git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@245 b3834d28-1941-0410-a4f8-b48e95affb8f

diff --git a/.htaccess b/.htaccess
index cfe39b9529cd59880b418918a05b8c8d9b587fa1..27fd434d7a1c5db2688efb5f7f0a12666925a1c5 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -3,34 +3,13 @@
 # (see $cleanurls in config.inc.php)
 #####################################
 
-#Options +FollowSymlinks
-#RewriteEngine On
-#RewriteBase /
-#RewriteCond %{REQUEST_FILENAME} !-f
-#RewriteCond %{REQUEST_FILENAME} !-d
-#RewriteRule ^([^/]+)/?(.*)       $1.php/$2       [L]
-
-# If you have Scuttle in subdirectories e.g. http://www.example.com/myscuttle/links/
-# then you need to comment the precedent line and remove comment of the following one
-# (replace "myscuttle/links/" with your subdirectories name)
-
-#RewriteRule ^([^/]+)/?(.*)      myscuttle/links/$1.php/$2       [L]
-
-####
 
 # Rewrite clean URLs onto real files
 <IfModule mod_rewrite.c>
 Options +FollowSymlinks
 RewriteEngine On
-RewriteBase /
-RewriteCond %{REQUEST_FILENAME} !-f
-RewriteCond %{REQUEST_FILENAME} !-d
 RewriteCond %{REQUEST_FILENAME}.php -f
-
-#if cleanurls don't work, comment option 1 (by adding # at the beginning) and uncomment option 2:
-RewriteRule ^([^/]+)/?(.*) $1.php?query=$2 [L,QSA]        #option 1
-#RewriteRule ^([^/]+)/?(.*)       $1.php/$2       [L]     #option 2
-
+RewriteRule ^([^/.]+)/?(.*)$ $1.php/$2 [QSA,L]
 </IfModule>