Changeset 8185

Timestamp:

03/28/2014 12:35:11 AM (12 years ago)

Author:

johnjamesjacoby

Message:

Revert r8183; broke unit tests as these functions can be called after headers are sent (which needs further investigation in a separate ticket.)

Location:

trunk

Files:

• bp-core/bp-core-functions.php (modified) (2 diffs)
• bp-messages/bp-messages-functions.php (modified) (1 diff)

trunk/bp-core/bp-core-functions.php

@@ -927 +927 @@
 
         // Send the values to the cookie for page reload display
-        setcookie( 'bp-message',      $message, time() + 60 * 60 * 24, COOKIEPATH );
-        setcookie( 'bp-message-type', $type,    time() + 60 * 60 * 24, COOKIEPATH );
+        @setcookie( 'bp-message',      $message, time() + 60 * 60 * 24, COOKIEPATH );
+        @setcookie( 'bp-message-type', $type,    time() + 60 * 60 * 24, COOKIEPATH );
 
         // Get BuddyPress
@@ -969 +969 @@
 
         if ( isset( $_COOKIE['bp-message'] ) ) {
-                setcookie( 'bp-message', false, time() - 1000, COOKIEPATH );
+                @setcookie( 'bp-message', false, time() - 1000, COOKIEPATH );
         }
 
         if ( isset( $_COOKIE['bp-message-type'] ) ) {
-                setcookie( 'bp-message-type', false, time() - 1000, COOKIEPATH );
+                @setcookie( 'bp-message-type', false, time() - 1000, COOKIEPATH );
         }
 }

trunk/bp-messages/bp-messages-functions.php

@@ -186 +186 @@
 
 function messages_add_callback_values( $recipients, $subject, $content ) {
-        setcookie( 'bp_messages_send_to', $recipients, time() + 60 * 60 * 24, COOKIEPATH );
-        setcookie( 'bp_messages_subject', $subject,    time() + 60 * 60 * 24, COOKIEPATH );
-        setcookie( 'bp_messages_content', $content,    time() + 60 * 60 * 24, COOKIEPATH );
+        @setcookie( 'bp_messages_send_to', $recipients, time() + 60 * 60 * 24, COOKIEPATH );
+        @setcookie( 'bp_messages_subject', $subject,    time() + 60 * 60 * 24, COOKIEPATH );
+        @setcookie( 'bp_messages_content', $content,    time() + 60 * 60 * 24, COOKIEPATH );
 }
 
 function messages_remove_callback_values() {
-        setcookie( 'bp_messages_send_to', false, time() - 1000, COOKIEPATH );
-        setcookie( 'bp_messages_subject', false, time() - 1000, COOKIEPATH );
-        setcookie( 'bp_messages_content', false, time() - 1000, COOKIEPATH );
+        @setcookie( 'bp_messages_send_to', false, time() - 1000, COOKIEPATH );
+        @setcookie( 'bp_messages_subject', false, time() - 1000, COOKIEPATH );
+        @setcookie( 'bp_messages_content', false, time() - 1000, COOKIEPATH );
 }