[php-blog-cvs] serendipity NEWS,1.166,1.167 serendipity_admin_installer.inc.php,1.68,1.69

[Tom S. <tom...@us...>]

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

Modified Files:
	NEWS serendipity_admin_installer.inc.php 
Log Message:
Fixed bug causing the .htaccess file to never get updated when changing rewrite method


Index: serendipity_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_installer.inc.php,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- serendipity_admin_installer.inc.php	16 Jun 2004 18:56:44 -0000	1.68
+++ serendipity_admin_installer.inc.php	5 Jul 2004 19:41:53 -0000	1.69
@@ -81,13 +81,14 @@
 
         }
 
+        $oldRewrite = $serendipity['rewrite']; // We save the rewrite method, because we run a check after $serendipity has been updated
         $res = serendipity_updateConfiguration();
         if (is_array($res)) {
             echo DIAGNOSTIC_ERROR;
             echo '<span style="color: #FF0000">- ' . implode('<br />', $res) . '</span><br /><br />';
         } else {
             /* If we have new rewrite rules, then install them */
-            if (isset($_POST['rewrite']) && $serendipity['serendipityUserLevel'] >= USERLEVEL_ADMIN && $serendipity['rewrite'] != $_POST['rewrite']) {
+            if (isset($_POST['rewrite']) && $serendipity['serendipityUserlevel'] >= USERLEVEL_ADMIN && $oldRewrite != $_POST['rewrite']) {
                 printf(ATTEMPT_WRITE_FILE, '.htaccess');
                 $res = serendipity_installFiles();
                 if (is_array($res)) {

Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -d -r1.166 -r1.167
--- NEWS	5 Jul 2004 08:25:49 -0000	1.166
+++ NEWS	5 Jul 2004 19:41:53 -0000	1.167
@@ -3,6 +3,9 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
+    * Fixed bug causing the .htaccess file to never get updated when 
+      changing rewrite method (tomsommer)
+
     * Track Exits plugin: Now only uses the link id for link referal.
       Reduces URI length and makes random exit.php calling useless for
       spammers, as no URL is tracked, which the author didn't refer to