Fixes Issue #521

This commit is contained in:
Garvin Hicking 2017-07-10 13:49:27 +02:00
parent 405fa77e3f
commit 07d75a6d65
5 changed files with 8 additions and 4 deletions

View File

@ -1,5 +1,9 @@
Version 2.x.x (major) () Version 2.x.x (major) ()
------------------------------------------------------------------------ ------------------------------------------------------------------------
* Adapt .htacess default rules to exclude rewriting documentation
(Issue #521)
* Add backend_view_entry hook, that is executed for every entry * Add backend_view_entry hook, that is executed for every entry
in the backend entry list in the backend entry list

View File

@ -6,6 +6,7 @@ Options -MultiViews
<IfModule mod_rewrite.c> <IfModule mod_rewrite.c>
RewriteEngine On RewriteEngine On
RewriteBase {PREFIX} RewriteBase {PREFIX}
RewriteRule ^plugins/.+/documentation.*\.html - [L]
RewriteRule ^serendipity_admin.php serendipity_admin.php [NC,L,QSA] RewriteRule ^serendipity_admin.php serendipity_admin.php [NC,L,QSA]
RewriteRule ^({PAT_PERMALINK}) {indexFile}?/$1 [NC,L,QSA] RewriteRule ^({PAT_PERMALINK}) {indexFile}?/$1 [NC,L,QSA]
RewriteRule ^({PAT_PERMALINK_AUTHORS}) {indexFile}?/$1 [NC,L,QSA] RewriteRule ^({PAT_PERMALINK_AUTHORS}) {indexFile}?/$1 [NC,L,QSA]
@ -28,7 +29,6 @@ RewriteRule ^{PAT_CSS}$ {indexFile}?url=/$1 [L,QSA]
RewriteRule ^{PAT_JS}$ {indexFile}?url=/$1 [L,QSA] RewriteRule ^{PAT_JS}$ {indexFile}?url=/$1 [L,QSA]
RewriteRule ^index\.(html?|php.+) {indexFile}?url=index.html [L,QSA] RewriteRule ^index\.(html?|php.+) {indexFile}?url=index.html [L,QSA]
RewriteRule ^htmlarea/(.*) htmlarea/$1 [L,QSA] RewriteRule ^htmlarea/(.*) htmlarea/$1 [L,QSA]
#RewriteCond %{REQUEST_URI} !-U
RewriteRule (.*\.html?) {indexFile}?url=/$1 [L,QSA] RewriteRule (.*\.html?) {indexFile}?url=/$1 [L,QSA]
</IfModule> </IfModule>

View File

@ -5,6 +5,7 @@ DirectoryIndex {PREFIX}{indexFile}
<IfModule mod_rewrite.c> <IfModule mod_rewrite.c>
RewriteEngine On RewriteEngine On
RewriteBase {PREFIX} RewriteBase {PREFIX}
RewriteRule ^plugins/.+/documentation.*\.html - [L]
RewriteRule ^serendipity_admin.php serendipity_admin.php [NC,L,QSA] RewriteRule ^serendipity_admin.php serendipity_admin.php [NC,L,QSA]
RewriteRule ^({PAT_PERMALINK}) {indexFile}?/$1 [NC,L,QSA] RewriteRule ^({PAT_PERMALINK}) {indexFile}?/$1 [NC,L,QSA]
RewriteRule ^({PAT_PERMALINK_AUTHORS}) {indexFile}?/$1 [NC,L,QSA] RewriteRule ^({PAT_PERMALINK_AUTHORS}) {indexFile}?/$1 [NC,L,QSA]
@ -27,7 +28,6 @@ RewriteRule ^{PAT_CSS} {indexFile}?url=/$1 [L,QSA]
RewriteRule ^{PAT_JS}$ {indexFile}?url=/$1 [L,QSA] RewriteRule ^{PAT_JS}$ {indexFile}?url=/$1 [L,QSA]
RewriteRule ^index\.(html?|php.+) {indexFile}?url=index.html [L,QSA] RewriteRule ^index\.(html?|php.+) {indexFile}?url=index.html [L,QSA]
RewriteRule ^htmlarea/(.*) htmlarea/$1 [L,QSA] RewriteRule ^htmlarea/(.*) htmlarea/$1 [L,QSA]
#RewriteCond %{REQUEST_URI} !-U
RewriteRule (.*\.html?) {indexFile}?url=/$1 [L,QSA] RewriteRule (.*\.html?) {indexFile}?url=/$1 [L,QSA]
</IfModule> </IfModule>

View File

@ -6,6 +6,7 @@ Options -MultiViews
<IfModule mod_rewrite.c> <IfModule mod_rewrite.c>
RewriteEngine On RewriteEngine On
RewriteBase {PREFIX} RewriteBase {PREFIX}
RewriteRule ^plugins/.+/documentation.*\.html - [L]
RewriteRule ^serendipity_admin.php serendipity_admin.php [NC,L,QSA] RewriteRule ^serendipity_admin.php serendipity_admin.php [NC,L,QSA]
RewriteRule ^({PAT_PERMALINK}) {indexFile}?/$1 [NC,L,QSA] RewriteRule ^({PAT_PERMALINK}) {indexFile}?/$1 [NC,L,QSA]
RewriteRule ^({PAT_PERMALINK_AUTHORS}) {indexFile}?/$1 [NC,L,QSA] RewriteRule ^({PAT_PERMALINK_AUTHORS}) {indexFile}?/$1 [NC,L,QSA]
@ -28,7 +29,6 @@ RewriteRule ^{PAT_CSS}$ {indexFile}?url=/$1 [L,QSA]
RewriteRule ^{PAT_JS}$ {indexFile}?url=/$1 [L,QSA] RewriteRule ^{PAT_JS}$ {indexFile}?url=/$1 [L,QSA]
RewriteRule ^index\.(html?|php.+) {indexFile}?url=index.html [L,QSA] RewriteRule ^index\.(html?|php.+) {indexFile}?url=index.html [L,QSA]
RewriteRule ^htmlarea/(.*) htmlarea/$1 [L,QSA] RewriteRule ^htmlarea/(.*) htmlarea/$1 [L,QSA]
#RewriteCond %{REQUEST_URI} !-U
RewriteRule (.*\.html?) {indexFile}?url=/$1 [L,QSA] RewriteRule (.*\.html?) {indexFile}?url=/$1 [L,QSA]
</IfModule> </IfModule>

View File

@ -5,6 +5,7 @@ DirectoryIndex {PREFIX}{indexFile}
<IfModule mod_rewrite.c> <IfModule mod_rewrite.c>
RewriteEngine On RewriteEngine On
RewriteBase {PREFIX} RewriteBase {PREFIX}
RewriteRule ^plugins/.+/documentation.*\.html - [L]
RewriteRule ^serendipity_admin.php serendipity_admin.php [NC,L,QSA] RewriteRule ^serendipity_admin.php serendipity_admin.php [NC,L,QSA]
RewriteRule ^({PAT_PERMALINK}) {indexFile}?/$1 [NC,L,QSA] RewriteRule ^({PAT_PERMALINK}) {indexFile}?/$1 [NC,L,QSA]
RewriteRule ^({PAT_PERMALINK_AUTHORS}) {indexFile}?/$1 [NC,L,QSA] RewriteRule ^({PAT_PERMALINK_AUTHORS}) {indexFile}?/$1 [NC,L,QSA]
@ -27,7 +28,6 @@ RewriteRule ^{PAT_CSS} {indexFile}?url=/$1 [L,QSA]
RewriteRule ^{PAT_JS}$ {indexFile}?url=/$1 [L,QSA] RewriteRule ^{PAT_JS}$ {indexFile}?url=/$1 [L,QSA]
RewriteRule ^index\.(html?|php.+) {indexFile}?url=index.html [L,QSA] RewriteRule ^index\.(html?|php.+) {indexFile}?url=index.html [L,QSA]
RewriteRule ^htmlarea/(.*) htmlarea/$1 [L,QSA] RewriteRule ^htmlarea/(.*) htmlarea/$1 [L,QSA]
#RewriteCond %{REQUEST_URI} !-U
RewriteRule (.*\.html?) {indexFile}?url=/$1 [L,QSA] RewriteRule (.*\.html?) {indexFile}?url=/$1 [L,QSA]
</IfModule> </IfModule>