[php-blog-cvs] serendipity htaccess.rewrite.tpl,1.12,1.13 serendipity_admin_upgrader.inc.php,1.15,1.16 serendipity_config.inc.php,1.85,1.86 serendipity_functions_installer.inc.php,1.20,1.21

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20219

Modified Files:
	htaccess.rewrite.tpl serendipity_admin_upgrader.inc.php 
	serendipity_config.inc.php 
	serendipity_functions_installer.inc.php 
Log Message:
If you add new subpaths, those need to be merged for mod_rewrite compatibility.
Bumped version to 0.6.8 to call installFiles() again and update .htaccess file


Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- serendipity_config.inc.php	16 Jul 2004 22:17:23 -0000	1.85
+++ serendipity_config.inc.php	17 Jul 2004 12:03:06 -0000	1.86
@@ -14,7 +14,7 @@
 }
 
 include_once(S9Y_INCLUDE_PATH . 'compat.php');
-$serendipity['version']      = '0.6.7-CVS';
+$serendipity['version']      = '0.6.8-CVS';
 $serendipity['production']   = 1;
 $serendipity['rewrite']      = 'none';
 $serendipity['messagestack'] = array();

Index: serendipity_functions_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_installer.inc.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- serendipity_functions_installer.inc.php	14 Jul 2004 11:52:43 -0000	1.20
+++ serendipity_functions_installer.inc.php	17 Jul 2004 12:03:06 -0000	1.21
@@ -620,7 +620,9 @@
                    '{PAT_ENTRIES}', '{PATH_ENTRIES}',
                    '{PAT_ARCHIVE}', '{PATH_ARCHIVE}',
                    '{PAT_CATEGORIES}', '{PATH_CATEGORIES}',
-                   '{PAT_PLUGIN}', '{PATH_PLUGIN}'
+                   '{PAT_PLUGIN}', '{PATH_PLUGIN}',
+                   '{PAT_DELETECOMMENT}', '{PATH_DELETECOMMENT}',
+                   '{PAT_APPROVECOMMENT}', '{PATH_APPROVECOMMENT}'
                  ),
 
                  array(
@@ -636,6 +638,8 @@
                    trim(PAT_ARCHIVE, '@/i'), PATH_ARCHIVE,
                    trim(PAT_CATEGORIES, '@/i'), PATH_CATEGORIES,
                    trim(PAT_PLUGIN, '@/i'), PATH_PLUGIN,
+                   trim(PAT_DELETECOMMENT, '@/i'), PATH_DELETECOMMENT,
+                   trim(PAT_APPROVECOMMENT, '@/i'), PATH_APPROVECOMMENT
                  ),
 
                  implode('', $a)

Index: serendipity_admin_upgrader.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_upgrader.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- serendipity_admin_upgrader.inc.php	14 Jul 2004 11:52:43 -0000	1.15
+++ serendipity_admin_upgrader.inc.php	17 Jul 2004 12:03:06 -0000	1.16
@@ -13,7 +13,7 @@
 /* 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.7'   => 'serendipity_installFiles');
+               '0.6.8'   => 'serendipity_installFiles');
 
 
 /* Fetch SQL files which needs to be run */
@@ -164,8 +164,8 @@
         $taskCount++;
     }
 
-    if (version_compare(serendipity_version($serendipity['versionInstalled']), '0.7', '<')) {
-        echo '<br /><strong>0.7 - .htaccess</strong>';
+    if (version_compare(serendipity_version($serendipity['versionInstalled']), '0.6.8', '<')) {
+        echo '<br /><strong>0.6.8 - .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.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- htaccess.rewrite.tpl	14 Jul 2004 11:52:43 -0000	1.12
+++ htaccess.rewrite.tpl	17 Jul 2004 12:03:06 -0000	1.13
@@ -10,6 +10,8 @@
 RewriteRule ^([0-9]+)_[0-9a-z_]*\.html {indexFile}?url=$1_article.html [L,NC,QSA]
 RewriteRule ^{PAT_FEEDS}/(.*) {indexFile}?url=/{PATH_FEEDS}/$1 [L,QSA]
 RewriteRule ^{PAT_UNSUBSCRIBE} {indexFile}?url=/{PATH_UNSUBSCRIBE}/$1/$2 [L,QSA]
+RewriteRule ^{PAT_APPROVECOMMENT} {indexFile}?url={PATH_APPROVECOMMENT}/$1/$2 [L,QSA]
+RewriteRule ^{PAT_DELETECOMMENT} {indexFile}?url={PATH_DELETECOMMENT}/$1/$2 [L,QSA]
 RewriteRule ^{PAT_ADMIN} serendipity_admin.php [L,QSA]
 RewriteRule ^{PAT_ENTRIES} serendipity_entries.php [L,QSA]
 RewriteRule ^{PAT_ARCHIVE} {indexFile}?url=/{PATH_ARCHIVE} [L,QSA]