Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4697
Modified Files:
serendipity_functions.inc.php
serendipity_admin_installer.inc.php
serendipity_admin_upgrader.inc.php
Log Message:
Remove notices which can be produced by session_destroy()
Index: serendipity_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_installer.inc.php,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- serendipity_admin_installer.inc.php 24 May 2004 10:42:53 -0000 1.63
+++ serendipity_admin_installer.inc.php 3 Jun 2004 21:18:46 -0000 1.64
@@ -81,7 +81,7 @@
$_POST['serendipityHTTPPath']
);
- session_destroy();
+ @session_destroy();
}
Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.275
retrieving revision 1.276
diff -u -d -r1.275 -r1.276
--- serendipity_functions.inc.php 28 May 2004 09:31:18 -0000 1.275
+++ serendipity_functions.inc.php 3 Jun 2004 21:18:45 -0000 1.276
@@ -29,7 +29,7 @@
function serendipity_logout() {
$_SESSION['serendipityAuthedUser'] = false;
- session_destroy();
+ @session_destroy();
serendipity_deleteCookie('author_information');
}
@@ -1455,7 +1455,7 @@
function serendipity_sendComment($to, $fromName, $fromEmail, $fromUrl, $id, $title, $comment, $type = 'NORMAL') {
global $serendipity;
-
+
if (empty($fromName)) {
$fromName = ANONYMOUS;
}
@@ -2370,7 +2370,7 @@
return true;
} else {
$_SESSION['serendipityAuthedUser'] = false;
- session_destroy();
+ @session_destroy();
}
}
Index: serendipity_admin_upgrader.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_upgrader.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- serendipity_admin_upgrader.inc.php 26 May 2004 17:02:32 -0000 1.9
+++ serendipity_admin_upgrader.inc.php 3 Jun 2004 21:18:46 -0000 1.10
@@ -71,7 +71,7 @@
echo '<br />';
printf(SERENDIPITY_UPGRADER_RETURN_HERE, '<a href="'. $serendipity['serendipityHTTPPath'] .'">', '</a>');
$_SESSION['serendipityAuthedUser'] = false;
- session_destroy();
+ @session_destroy();
} else {
echo SERENDIPITY_UPGRADER_WELCOME . '<br />';
printf(SERENDIPITY_UPGRADER_PURPOSE . '<br />', $serendipity['versionInstalled']);
|