Merge trunk fix for [ 1480341 ] Timezone Bug

[scuttle] / .htaccess

diff --git a/.htaccess b/.htaccess
index c129f6940b7a1a05a10d3a4673f4454dd675f6bf..af3cae928ef4301806388e4c6425cbda69afb59f 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -1,7 +1,10 @@
 Options +FollowSymlinks
-AcceptPathInfo On
+<IfDefine APACHE2>
+    AcceptPathInfo On
+</IfDefine>
 RewriteEngine On
 RewriteBase /
 RewriteCond %{REQUEST_FILENAME} !-f
 RewriteCond %{REQUEST_FILENAME} !-d
-RewriteRule ^([^/]+)/?(.*)      $1.php/$2       [L]
+RewriteCond %{REQUEST_FILENAME}.php -f
+RewriteRule ^([^/]+)/?(.*)      $1.php/$2   [L]