Ticket #2432: 2432.2.patch

bp-themes/bp-default/_inc/css/default.css

@@ -541 +541 @@
         margin: 20px 0;
 }
 
-span.activity, div#message p {
+span.activity, div#message p, div.message p {
         display: inline-block;
         font-size: 11px;
         font-weight: normal;
@@ -610 +610 @@
 /* > Error / Success Messages
 -------------------------------------------------------------- */
 
-div#message {
+div#message, div.message {
         margin: 15px 0;
 }
-        div#message.updated { clear: both; }
+        div#message.updated, div#template-messages div.updated { clear: both; }
 
-div#message p {
+div#message p, div.message p {
         padding: 10px 15px;
         font-size: 12px;
         display:block;
 }
-        div#message.error p {
+        div#message.error p, div#template-messages div.error p {
                 background: #e41717;
                 color: #fff;
                 border-color: #a71a1a;
                 clear: left;
         }
 
-        div#message.updated p {
+        div#message.updated p, div#template-messages div.updated p {
                 background: #dffcd9;
                 color: #1a9b00;
                 border-color: #c4e9bd;

bp-core.php

@@ -1282 +1282 @@
  */
 function bp_core_add_message( $message, $type = false ) {
         global $bp;
-
+        
         if ( !$type )
                 $type = 'success';
+        
+        if ( empty( $message ) )
+                return;
+        
+        $messages = isset( $bp->template_message ) ? $bp->template_message : array();
 
-        /* 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 );
-
+        $messages[] = array( 'content' => $message, 'type' => $type );
+        
         /***
          * Send the values to the $bp global so we can still output messages
          * without a page reload
          */
-        $bp->template_message = $message;
-        $bp->template_message_type = $type;
+        $bp->template_message = $messages;
+        
+        /* This is to prevent problems with cookies handling serialized strings */
+        $messages = base64_encode( maybe_serialize( $messages ) );
+
+        /* Send the values to the cookie for page reload display */
+        @setcookie( 'bp-message', $messages, time()+60*60*24, COOKIEPATH );
 }
 
 /**
@@ -1315 +1323 @@
 function bp_core_setup_message() {
         global $bp;
 
-        if ( empty( $bp->template_message ) && isset( $_COOKIE['bp-message'] ) )
-                $bp->template_message = $_COOKIE['bp-message'];
+        if ( empty( $bp->template_message ) && isset( $_COOKIE['bp-message'] ) ) {
+                $bp->template_message = maybe_unserialize( imap_base64 ( $_COOKIE['bp-message'] ) );
+        }
 
-        if ( empty( $bp->template_message_type ) && isset( $_COOKIE['bp-message-type'] ) )
-                $bp->template_message_type = $_COOKIE['bp-message-type'];
-
         add_action( 'template_notices', 'bp_core_render_message' );
 
         @setcookie( 'bp-message', false, time() - 1000, COOKIEPATH );
-        @setcookie( 'bp-message-type', false, time() - 1000, COOKIEPATH );
 }
 add_action( 'wp', 'bp_core_setup_message', 2 );
 
@@ -1341 +1346 @@
         global $bp;
 
         if ( $bp->template_message ) {
-                $type = ( 'success' == $bp->template_message_type ) ? 'updated' : 'error';
-        ?>
-                <div id="message" class="<?php echo $type; ?>">
-                        <p><?php echo stripslashes( esc_attr( $bp->template_message ) ); ?></p>
+                do_action( 'bp_core_before_render_message' );
+                ?>
+                
+                <div id="template-messages">
+
+                <?php foreach( (array)$bp->template_message as $message ) : ?>
+                        <div class="<?php echo ( 'success' == $message['type'] ) ? 'updated' : 'error'; ?> message">
+                                <p><?php echo stripslashes( esc_attr( $message['content'] ) ); ?></p>
+                        </div>
+                <?php endforeach ?>
+                
                 </div>
-        <?php
+                
+                <?php
                 do_action( 'bp_core_render_message' );
         }
 }