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

Merge branch '2.0' of github.com:s9y/Serendipity into 2.0

Browse Source
This commit is contained in:
Ian
2014-11-02 15:28:25 +01:00
parent d4544bec17 35628a3e2c
commit 2e2de24368
8 changed files with 14 additions and 2 deletions

4
docs/NEWS

@ -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
* Removed experimental support for PHP/SMARTY IN-MEMORY caching
added in 2.0-beta3, since this could not work.

4
include/admin/upgrader.inc.php

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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'.