mbirth/LuckyCoinkydink
1
0
Fork 0
Code Issues Pull Requests Activity

Make PAT_JS mod_rewrite pattern be recognized to .htaccess to prevent ErrorLog entries for looking up such URLs.

Browse Source 
Bumps version to beta6 and will recreate .htaccess file
This commit is contained in:
Garvin Hicking 2014-11-02 15:20:21 +01:00
parent 55c321b678
commit 9944cbb0a7
8 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/NEWS
View File

@ -1,8 +1,10 @@
#
Version 2.0-beta4/5 / RC? ()
Version 2.0-beta4/5/6 / RC? ()
------------------------------------------------------------------------
* Added new PAT_JS mod_rewrite rule to .htaccess files
* Smarty 3.1.21 upgrade (see changelog)
* Fix issue #220 with pdf directory moving rename() error

4
include/admin/upgrader.inc.php
View File

@ -235,6 +235,10 @@ $tasks = array(array('version' => '0.5.1',
'arguments' => array('serendipity_event_dashboard'),
'title' => 'Remove dashboard plugin',
'desc' => 'Serendipity 2.0 includes a dashboard in the admin theme. The separate plugin for 1.x has to be removed.'),
array('version' => '2.0-beta6',
'function' => 'serendipity_installFiles',
'title' => 'Update of .htaccess file',
'desc' => 'Changes were made to the .htaccess file to allow for new patterns, it will be recreated. If you manually modified the file, make sure your modification are in place afterwards.'),
);

2
include/functions_installer.inc.php
View File

@ -758,6 +758,7 @@ function serendipity_installFiles($serendipity_core = '') {
'{PAT_SEARCH}', '{PATH_SEARCH}',
'{PAT_COMMENTS}', '{PATH_COMMENTS}',
'{PAT_CSS}',
'{PAT_JS}',
'{PAT_PERMALINK}',
'{PAT_PERMALINK_AUTHORS}',
'{PAT_PERMALINK_FEEDCATEGORIES}',
@ -780,6 +781,7 @@ function serendipity_installFiles($serendipity_core = '') {
trim($PAT['SEARCH'], '@/i'), $serendipity['permalinkSearchPath'],
trim($PAT['COMMENTS'], '@/i'), $serendipity['permalinkCommentsPath'],
trim(PAT_CSS, '@/i'),
trim(PAT_JS, '@/i'),
trim($PAT['PERMALINK'], '@/i'),
trim($PAT['PERMALINK_AUTHORS'], '@/i'),
trim($PAT['PERMALINK_FEEDCATEGORIES'], '@/i'),

1
include/tpl/htaccess_cgi_rewrite.tpl
View File

@ -24,6 +24,7 @@ RewriteRule ^{PAT_PLUGIN} {indexFile}?url=$1/$2 [L,QSA]
RewriteRule ^{PAT_SEARCH} {indexFile}?url=/{PATH_SEARCH}/$1 [L,QSA]
RewriteRule ^{PAT_COMMENTS} {indexFile}?url=/{PATH_COMMENTS}/$1 [L,QSA]
RewriteRule ^{PAT_CSS}$ {indexFile}?url=/$1 [L,QSA]
RewriteRule ^{PAT_JS}$ {indexFile}?url=/$1 [L,QSA]
RewriteRule ^index\.(html?|php.+) {indexFile}?url=index.html [L,QSA]
RewriteRule ^htmlarea/(.*) htmlarea/$1 [L,QSA]
#RewriteCond %{REQUEST_URI} !-U

1
include/tpl/htaccess_cgi_rewrite2.tpl
View File

@ -24,6 +24,7 @@ RewriteRule ^{PAT_PLUGIN} {indexFile}?url=$1/$2 [L,QSA]
RewriteRule ^{PAT_SEARCH} {indexFile}?url=/{PATH_SEARCH}/$1 [L,QSA]
RewriteRule ^{PAT_COMMENTS} {indexFile}?url=/{PATH_COMMENTS}/$1 [L,QSA]
RewriteRule ^{PAT_CSS} {indexFile}?url=/$1 [L,QSA]
RewriteRule ^{PAT_JS}$ {indexFile}?url=/$1 [L,QSA]
RewriteRule ^index\.(html?|php.+) {indexFile}?url=index.html [L,QSA]
RewriteRule ^htmlarea/(.*) htmlarea/$1 [L,QSA]
#RewriteCond %{REQUEST_URI} !-U

1
include/tpl/htaccess_rewrite.tpl
View File

@ -26,6 +26,7 @@ RewriteRule ^{PAT_PLUGIN} {indexFile}?url=$1/$2 [L,QSA]
RewriteRule ^{PAT_SEARCH} {indexFile}?url=/{PATH_SEARCH}/$1 [L,QSA]
RewriteRule ^{PAT_COMMENTS} {indexFile}?url=/{PATH_COMMENTS}/$1 [L,QSA]
RewriteRule ^{PAT_CSS}$ {indexFile}?url=/$1 [L,QSA]
RewriteRule ^{PAT_JS}$ {indexFile}?url=/$1 [L,QSA]
RewriteRule ^index\.(html?|php.+) {indexFile}?url=index.html [L,QSA]
RewriteRule ^htmlarea/(.*) htmlarea/$1 [L,QSA]
#RewriteCond %{REQUEST_URI} !-U

1
include/tpl/htaccess_rewrite2.tpl
View File

@ -26,6 +26,7 @@ RewriteRule ^{PAT_PLUGIN} {indexFile}?url=$1/$2 [L,QSA]
RewriteRule ^{PAT_SEARCH} {indexFile}?url=/{PATH_SEARCH}/$1 [L,QSA]
RewriteRule ^{PAT_COMMENTS} {indexFile}?url=/{PATH_COMMENTS}/$1 [L,QSA]
RewriteRule ^{PAT_CSS} {indexFile}?url=/$1 [L,QSA]
RewriteRule ^{PAT_JS}$ {indexFile}?url=/$1 [L,QSA]
RewriteRule ^index\.(html?|php.+) {indexFile}?url=index.html [L,QSA]
RewriteRule ^htmlarea/(.*) htmlarea/$1 [L,QSA]
#RewriteCond %{REQUEST_URI} !-U

2
serendipity_config.inc.php
View File

@ -44,7 +44,7 @@ if (defined('USE_MEMSNAP')) {
}
// The version string
$serendipity['version'] = '2.0-beta5';
$serendipity['version'] = '2.0-beta6';
// Setting this to 'false' will enable debugging output. All alpha/beta/cvs snapshot versions will emit debug information by default. To increase the debug level (to enable Smarty debugging), set this flag to 'debug'.