Merge pull request #172 from leomoon/master

fix stop direct md access when wikidocs is not installed at root
Zavy86 · Aug 24, 2024 · 3d1ea9b · 3d1ea9b
2 parents ec4c58d + fdd97a2
commit 3d1ea9b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.0.44
+1.0.45
diff --git a/sample.htaccess b/sample.htaccess
@@ -1,6 +1,8 @@
-<IfModule mod_rewrite.c>
-	RewriteEngine On
-	RewriteBase /
-	RewriteCond %{REQUEST_FILENAME} !-f
-	RewriteRule ^(.*)$ index.php?doc=$1 [NC,L,QSA]
-</IfModule>
+<IfModule mod_rewrite.c>
+	RewriteEngine On
+	RewriteBase /
+	RewriteCond %{REQUEST_URI} \.md$ [NC]
+	RewriteRule ^.*$ / [R=301,L]
+	RewriteCond %{REQUEST_FILENAME} !-f
+	RewriteRule ^(.*)$ index.php?doc=$1 [NC,L,QSA]
+</IfModule>
diff --git a/setup.php b/setup.php
@@ -64,7 +64,7 @@
 	$htaccess.="\tRewriteEngine On\n";
 	$htaccess.="\tRewriteBase ".$_SESSION['wikidocs']['setup']['path']."\n";
 	$htaccess.="\tRewriteCond %{REQUEST_URI} \.md$ [NC]\n";
-	$htaccess.="\tRewriteRule ^.*$ / [R=301,L]\n";
+	$htaccess.="\tRewriteRule ^.*$ ".$_SESSION['wikidocs']['setup']['path']." [R=301,L]\n";
 	$htaccess.="\tRewriteCond %{REQUEST_FILENAME} !-f\n";
 	$htaccess.="\tRewriteRule ^(.*)$ index.php?doc=$1 [NC,L,QSA]\n";
 	$htaccess.="</IfModule>\n";