[php-blog-cvs] serendipity index.php,1.33,1.34 serendipity_functions.inc.php,1.223,1.224

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

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

Modified Files:
	index.php serendipity_functions.inc.php 
Log Message:
Bugfix: Cookie information was not saved because of a missing global $serendipity.

Did I already say we could need a QA-guy? :-)


Index: index.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/index.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- index.php	25 Feb 2004 17:42:48 -0000	1.33
+++ index.php	15 Mar 2004 08:09:09 -0000	1.34
@@ -71,6 +71,9 @@
 
     echo $data;
 } else if (preg_match('@/(\d+)_\w*\.html@i', $uri, $matches)) {
+    header('X-CommentSaver: true');
+    serendipity_rememberComment();
+
     if (!empty($serendipity['POST']['submit'])) {
         $comment['url']       = $serendipity['POST']['url'];
         $comment['comment']   = trim($serendipity['POST']['comment']);
@@ -98,8 +101,6 @@
     $_GET['serendipity']['action'] = 'read';
     $_GET['serendipity']['id']     = $id;
 
-    serendipity_rememberComment();
-
     $title = serendipity_db_query("SELECT title FROM {$serendipity['dbPrefix']}entries " .
                                  'WHERE id=' . serendipity_db_escape_string($id), true);
     $title = $title[0];

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -d -r1.223 -r1.224
--- serendipity_functions.inc.php	3 Mar 2004 14:39:07 -0000	1.223
+++ serendipity_functions.inc.php	15 Mar 2004 08:09:10 -0000	1.224
@@ -256,18 +256,23 @@
 
 function serendipity_setCookie($name,$value) {
     global $serendipity;
+
     setcookie("serendipity[$name]", $value, time()+60*60*24*30, $serendipity['serendipityHTTPPath']);
     $_COOKIE[$name] = $value;
     $serendipity['COOKIE'][$name] = $value;
 }
 
 function serendipity_deleteCookie($name) {
+    global $serendipity;
+
     setcookie("serendipity[$name]", '', time()-4000);
     unset($_COOKIE[$name]);
     unset($serendipity['COOKIE'][$name]);
 }
 
 function serendipity_rememberComment() {
+    global $serendipity;
+
     if (isset($serendipity['POST']['remember'])) {
         serendipity_rememberCommentDetails(
           array(
@@ -283,6 +288,8 @@
 }
 
 function serendipity_rememberCommentDetails($details) {
+    global $serendipity;
+    
     foreach ($details as $n => $v) {
         serendipity_setCookie($n, $v);
     }
@@ -2424,7 +2431,6 @@
     return $ver;
 }
 
-
 define("serendipity_FUNCTIONS_LOADED", true);
 /* vim: set sts=4 ts=4 expandtab : */
 ?>