|
From: Garvin H. <gar...@us...> - 2004-07-14 11:52:54
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13428 Modified Files: NEWS htaccess.rewrite.tpl serendipity_admin_upgrader.inc.php serendipity_functions_installer.inc.php Log Message: * update htaccess correctly on the next release * updated NEWS Index: NEWS =================================================================== RCS file: /cvsroot/php-blog/serendipity/NEWS,v retrieving revision 1.172 retrieving revision 1.173 diff -u -d -r1.172 -r1.173 --- NEWS 14 Jul 2004 10:21:05 -0000 1.172 +++ NEWS 14 Jul 2004 11:52:43 -0000 1.173 @@ -3,6 +3,15 @@ Version 0.7 () ------------------------------------------------------------------------ + * An entries' LastModified timestamp will get updated if a comment + is made to it, but only if the article is newer than 7 days. + Make the conditional Get RSS-feed a lot more usable because old + entries no longer come up again. The limit of days can be set + within serendipity_config.inc.php. (garvinhicking) + + * Plugins can register the event-hook 'external_plugin' to spawn + individual content outside of the blog layout (garvinhicking) + * Fixed link insertion in non-WYSIWYG-mode for Internet Explorer (garvinhicking) Index: serendipity_functions_installer.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_installer.inc.php,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- serendipity_functions_installer.inc.php 14 Jul 2004 03:42:06 -0000 1.19 +++ serendipity_functions_installer.inc.php 14 Jul 2004 11:52:43 -0000 1.20 @@ -583,9 +583,19 @@ $htaccess = @file_get_contents('./.htaccess'); - if ($_POST['rewrite'] == 'rewrite') { + // Let this function be callable outside installation and let it use existing settings. + $import = array('rewrite', 'serendipityHTTPPath', 'indexFile'); + foreach($import AS $key) { + if (empty($_POST[$key]) && isset($serendipity[$key])) { + $$key = $serendipity[$key]; + } else { + $$key = $_POST[$key]; + } + } + + if ($rewrite == 'rewrite') { $template = 'htaccess.rewrite.tpl'; - } elseif ($_POST['rewrite'] == 'errordocs') { + } elseif ($rewrite == 'errordocs') { $template = 'htaccess.errordocs.tpl'; } else { $template = 'htaccess.normal.tpl'; @@ -610,11 +620,12 @@ '{PAT_ENTRIES}', '{PATH_ENTRIES}', '{PAT_ARCHIVE}', '{PATH_ARCHIVE}', '{PAT_CATEGORIES}', '{PATH_CATEGORIES}', + '{PAT_PLUGIN}', '{PATH_PLUGIN}' ), array( - $_POST['serendipityHTTPPath'], - $_POST['indexFile'], + $serendipityHTTPPath, + $indexFile, trim(PAT_UNSUBSCRIBE, '@/i'), PATH_UNSUBSCRIBE, trim(PAT_ARCHIVES, '@/i'), PATH_ARCHIVES, trim(PAT_ARCHIVES_SHORT, '@/i'), @@ -624,6 +635,7 @@ trim(PAT_ENTRIES, '@/i'), PATH_ENTRIES, trim(PAT_ARCHIVE, '@/i'), PATH_ARCHIVE, trim(PAT_CATEGORIES, '@/i'), PATH_CATEGORIES, + trim(PAT_PLUGIN, '@/i'), PATH_PLUGIN, ), implode('', $a) Index: serendipity_admin_upgrader.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_upgrader.inc.php,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- serendipity_admin_upgrader.inc.php 29 Jun 2004 10:48:57 -0000 1.14 +++ serendipity_admin_upgrader.inc.php 14 Jul 2004 11:52:43 -0000 1.15 @@ -12,7 +12,8 @@ /* Functions which needs to be run if installed version is equal or lower */ $tasks = array('0.5.1' => 'serendipity_syncThumbs', - '0.6.5' => 'serendipity_rebuildCategoryTree'); + '0.6.5' => 'serendipity_rebuildCategoryTree', + '0.7' => 'serendipity_installFiles'); /* Fetch SQL files which needs to be run */ @@ -160,7 +161,12 @@ if (version_compare(serendipity_version($serendipity['versionInstalled']), '0.6.5', '<')) { echo '<br /><strong>0.6.5 - Nested subcategories, post to multiple categories</strong>'; echo '<br />[<strong style="color: red">INFO</strong>] This update will update the categories table of your database and update the relations from entries to categories. This is a possibly dangerous task to perform, so <strong style="color: red">make sure you have a backup of your database!</strong><br />'; - echo '<br />The categories-update syntax feature has only been tested for MySQL. PostgreSQL support should be tested first!!!<br/>'; + $taskCount++; + } + + if (version_compare(serendipity_version($serendipity['versionInstalled']), '0.7', '<')) { + echo '<br /><strong>0.7 - .htaccess</strong>'; + echo '<br />[INFO] The Plugin API now allows external plugins to generate individual content. Your .htaccess file needs to be updated for this to occur. This will happen automatically, if you continue. If you made individual changes to your .htaccess file, backup that file now.<br />'; $taskCount++; } Index: htaccess.rewrite.tpl =================================================================== RCS file: /cvsroot/php-blog/serendipity/htaccess.rewrite.tpl,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- htaccess.rewrite.tpl 9 Jul 2004 09:34:52 -0000 1.11 +++ htaccess.rewrite.tpl 14 Jul 2004 11:52:43 -0000 1.12 @@ -15,9 +15,9 @@ RewriteRule ^{PAT_ARCHIVE} {indexFile}?url=/{PATH_ARCHIVE} [L,QSA] RewriteRule ^{PAT_CATEGORIES} {indexFile}?url={PATH_ARCHIVE}/$1 [L,QSA] RewriteRule ^{PAT_FEED} rss.php?file=$1&ext=$2 +RewriteRule ^{PAT_PLUGIN} {indexFile}?url=plugin/$1 [L,QSA] RewriteRule ^index\.(html?|php.?) {indexFile}?url=index.html [L,QSA] RewriteRule ^htmlarea/(.*) htmlarea/$1 [L,QSA] -RewriteRule ^plugin/(.*) {indexFile}?url=plugin/$1 [L,QSA] RewriteRule (.*\.html?) {indexFile}?url=/$1 [L,QSA] <Files *.tpl> |
