Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv24002
Modified Files:
serendipity_functions.inc.php
Log Message:
Backing out r1.122
Trying to remove some of the apparent "Bad syntax", by request
Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -d -r1.124 -r1.125
--- serendipity_functions.inc.php 10 Aug 2003 22:23:45 -0000 1.124
+++ serendipity_functions.inc.php 10 Aug 2003 22:29:36 -0000 1.125
@@ -7,13 +7,13 @@
function serendipity_userLoggedIn() {
global $serendipity;
- if ( serendipity_authenticate_author($serendipity['POST']['user'], $serendipity['POST']['pass']) ) {
+ if (serendipity_authenticate_author($serendipity['POST']['user'], $serendipity['POST']['pass'])) {
$_SESSION['serendipityAuthedUser'] = true;
$serendipity['authorid'] = $_SESSION['serendipityAuthorid'];
return true;
}
- if ( $_SESSION['serendipityAuthedUser'] === true && file_exists($serendipity['serendipityPath'] . 'serendipity_config_local.inc.php') ) {
+ if ($_SESSION['serendipityAuthedUser'] === true && file_exists($serendipity['serendipityPath'] . 'serendipity_config_local.inc.php')) {
return true;
} else {
return false;
@@ -807,7 +807,7 @@
AND e.authorid = a.authorid";
$row = serendipity_db_query($query, true);
- if( $row['mail_comments'] ) {
+ if($row['mail_comments']) {
serendipity_sendComment($row['email'], $name, $email, $url, $id, $row['title'], $comments, $type);
}
serendipity_purgeEntry($id, $t);
@@ -830,15 +830,12 @@
function serendipity_sendComment($to, $fromName, $fromEmail, $fromUrl, $id, $title, $comment, $type = 'NORMAL') {
global $serendipity;
- if ( $_SESSION['serendipityAuthedUser'] && $type == 'NORMAL' ) {
- return true;
- }
-
$entryURI = serendipity_archiveURL($id, $title);
if ($type == 'TRACKBACK') {
$subject = '[' . $serendipity['blogTitle'] . '] ' . NEW_TRACKBACK_TO . ' ' . $title;
$text = sprintf(A_NEW_TRACKBACK_BLAHBLAH, $title)
+ . "\n"
. "\n" . LINK_TO_ENTRY . ': ' . $entryURI
. "\n" . 'Weblog ' . NAME . ': ' . stripslashes($fromName)
. "\n" . LINK_TO_REMOTE_ENTRY . ': ' . $fromUrl
|
