Changeset 7260

Timestamp:

07/10/2013 07:53:31 AM (13 years ago)

Author:

djpaul

Message:

Port r7254 from 1.7 branch to trunk - setcookie tweaks

"Only delete the bp-message and bp-message-type cookies when they are currently set. Otherwise, Set-Cookie headers are always issued, which messes with caching proxies."

File:

• trunk/bp-core/bp-core-functions.php (modified) (1 diff)

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

@@ -780 +780 @@
         add_action( 'template_notices', 'bp_core_render_message' );
 
-        @setcookie( 'bp-message',      false, time() - 1000, COOKIEPATH );
-        @setcookie( 'bp-message-type', false, time() - 1000, COOKIEPATH );
+        if ( isset( $_COOKIE['bp-message'] ) )
+                @setcookie( 'bp-message', false, time() - 1000, COOKIEPATH );
+        if ( isset( $_COOKIE['bp-message-type'] ) )
+                @setcookie( 'bp-message-type', false, time() - 1000, COOKIEPATH );
 }
 add_action( 'bp_actions', 'bp_core_setup_message', 5 );