Changeset 2419

Timestamp:

04/09/2010 05:17:33 PM (16 years ago)

Author:

chrishajer

Message:

Check bb_ksd_pre_post_status before sending out "subscribe to topic" notifications". Fixes #1233, props Nightgunner5

Location:

trunk/bb-includes

Files:

• functions.bb-posts.php (modified) (2 diffs)
• functions.bb-template.php (modified) (1 diff)

trunk/bb-includes/functions.bb-posts.php

@@ -454 +454 @@
 
 function bb_notify_subscribers( $post_id ) {
-    global $bbdb, $bb_current_user;
+    global $bbdb, $bb_current_user, $bb_ksd_pre_post_status;
+
+    if ( !empty( $bb_ksd_pre_post_status ) )
+        return false;
 
     if ( !$post = bb_get_post( $post_id ) )
@@ -481 +484 @@
 
         $message = __( "%2\$s wrote:\n\n %3\$s\n\nTopic Link: %4\$s\n\nYou're getting this mail because you subscribed to the topic, visit the topic and login to unsubscribe." );
-        bb_mail( 
-            $user->user_email, 
-            '[' . bb_get_option('name') . '] ' . get_topic_title( $topic_id ), 
-            sprintf( $message, get_topic_title( $topic_id ), get_user_name( $post->poster_id ), strip_tags( get_post_text( $post_id ) ), get_post_link( $post_id ) ), 
-            'From: '.bb_get_option('name').' <'.bb_get_option('from_email').'>'
+        bb_mail(
+            $user->user_email,
+            '[' . bb_get_option('name') . '] ' . get_topic_title( $topic_id ),
+            sprintf( $message, get_topic_title( $topic_id ), get_user_name( $post->poster_id ), strip_tags( get_post_text( $post_id ) ), get_post_link( $post_id ) )
         );
     }

trunk/bb-includes/functions.bb-template.php

@@ -3408 +3408 @@
     global $topic, $bb_current_user, $bbdb, $bb;
 
-    if ( !$bb_current_user )
+    if ( !bb_is_user_logged_in() )
         return false;