[php-blog-cvs] serendipity serendipity_functions.inc.php,1.55,1.56

[<gsc...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv30055

Modified Files:
	serendipity_functions.inc.php 
Log Message:
make sure array is not empty


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- serendipity_functions.inc.php	26 May 2003 13:14:14 -0000	1.55
+++ serendipity_functions.inc.php	30 May 2003 14:24:21 -0000	1.56
@@ -51,6 +51,9 @@
 }
 function serendipity_forgetCommentDetails() {
 	global $serendipity;
+        if(!$serendipity['COOKIE']) {
+		return;
+	}
 	foreach ($serendipity['COOKIE'] as $n => $v) {
 		serendipity_deleteCookie($n);
 	}
@@ -280,8 +283,13 @@
 
 	/* pre-walk the array to collect them keyed by date */
 	$bydate = array();
+<<<<<<< serendipity_functions.inc.php
+	
+	if (!is_array($entries) || $entries[0] == false) {
+=======
 
 	if (!is_array($entries)) {
+>>>>>>> 1.43
   		echo "<br />".NO_ENTRIES_TO_PRINT;
 		return;
 	}