Ticket #8079: 8079.patch

src/bp-messages/bp-messages-template.php

@@ -1155 +1155 @@
 
 /**
  * Output the subject of the current notice in the loop.
+ *
+ * @since 5.0.0 The $notice parameter has been added.
+ *
+ * @param BP_Messages_Notice $notice The notice object.
  */
-function bp_message_notice_subject() {
-        echo bp_get_message_notice_subject();
+function bp_message_notice_subject( $notice = null ) {
+        echo bp_get_message_notice_subject( $notice );
 }
         /**
          * Get the subject of the current notice in the loop.
          *
+         * @since 5.0.0 The $notice parameter has been added.
+         *
+         * @param BP_Messages_Notice $notice The notice object.
          * @return string
          */
-        function bp_get_message_notice_subject() {
+        function bp_get_message_notice_subject( $notice = null ) {
                 global $messages_template;
 
+                if ( ! isset( $notice->subject ) ) {
+                        $notice =& $messages_template->thread;
+                }
+
                 /**
                  * Filters the subject of the current notice in the loop.
                  *
@@ -1174 +1185 @@
                  *
                  * @param string $subject Subject of the current notice in the loop.
                  */
-                return apply_filters( 'bp_get_message_notice_subject', $messages_template->thread->subject );
+                return apply_filters( 'bp_get_message_notice_subject', $notice->subject );
         }
 
 /**
  * Output the text of the current notice in the loop.
+ *
+ * @since 5.0.0 The $notice parameter has been added.
+ *
+ * @param BP_Messages_Notice $notice The notice object.
  */
-function bp_message_notice_text() {
-        echo bp_get_message_notice_text();
+function bp_message_notice_text( $notice = null ) {
+        echo bp_get_message_notice_text( $notice );
 }
         /**
          * Get the text of the current notice in the loop.
          *
+         * @since 5.0.0 The $notice parameter has been added.
+         *
+         * @param BP_Messages_Notice $notice The notice object.
          * @return string
          */
-        function bp_get_message_notice_text() {
+        function bp_get_message_notice_text( $notice = null ) {
                 global $messages_template;
 
+                if ( ! isset( $notice->subject ) ) {
+                        $notice =& $messages_template->thread;
+                }
+
                 /**
                  * Filters the text of the current notice in the loop.
                  *
@@ -1198 +1220 @@
                  *
                  * @param string $message Text for the current notice in the loop.
                  */
-                return apply_filters( 'bp_get_message_notice_text', $messages_template->thread->message );
+                return apply_filters( 'bp_get_message_notice_text', $notice->message );
         }
 
 /**
@@ -1334 +1356 @@
                 if ( !in_array( $notice->id, $closed_notices ) && $notice->id ) {
                         ?>
                         <div id="message" class="info notice" rel="n-<?php echo esc_attr( $notice->id ); ?>">
-                                <p>
-                                        <strong><?php echo stripslashes( wp_filter_kses( $notice->subject ) ) ?></strong><br />
-                                        <?php echo stripslashes( wp_filter_kses( $notice->message) ) ?>
-                                        <button type="button" id="close-notice" class="bp-tooltip" data-bp-tooltip="<?php esc_attr_e( 'Dismiss this notice', 'buddypress' ) ?>"><span class="bp-screen-reader-text"><?php _e( 'Dismiss this notice', 'buddypress' ) ?></span> <span aria-hidden="true">&Chi;</span></button>
-                                        <?php wp_nonce_field( 'bp_messages_close_notice', 'close-notice-nonce' ); ?>
-                                </p>
+                                <strong><?php bp_message_notice_subject( $notice ); ?></strong>
+                                <button type="button" id="close-notice" class="bp-tooltip" data-bp-tooltip="<?php esc_attr_e( 'Dismiss this notice', 'buddypress' ) ?>"><span class="bp-screen-reader-text"><?php _e( 'Dismiss this notice', 'buddypress' ) ?></span> <span aria-hidden="true">&Chi;</span></button>
+                                <?php bp_message_notice_text( $notice ); ?>
+                                <?php wp_nonce_field( 'bp_messages_close_notice', 'close-notice-nonce' ); ?>
                         </div>
                         <?php
                 }

src/bp-templates/bp-legacy/css/buddypress-rtl.css

@@ -624 +624 @@
 }
 
 #buddypress div#message p,
-#sitewide-notice p {
+#sitewide-notice p,
+#sitewide-notice strong:first-child {
         font-size: 90%;
         display: block;
         padding: 10px 15px;
@@ -1392 +1393 @@
         font-weight: 700;
 }
 
+#sitewide-notice,
+.bp-site-wide-message {
+        position: relative;
+}
+
 #buddypress div#message p,
-#sitewide-notice p {
+#sitewide-notice #message {
         background-color: #ffd;
         border: 1px solid #cb2;
         color: #440;
@@ -1405 +1411 @@
 .bp-site-wide-message #message p,
 .admin-bar-on #message p {
         padding-left: 25px;
-        position: relative;
 }
 
 .bp-site-wide-message #message button,

src/bp-templates/bp-legacy/css/buddypress.css

@@ -624 +624 @@
 }
 
 #buddypress div#message p,
-#sitewide-notice p {
+#sitewide-notice p,
+#sitewide-notice strong:first-child {
         font-size: 90%;
         display: block;
         padding: 10px 15px;
@@ -1392 +1393 @@
         font-weight: 700;
 }
 
+#sitewide-notice,
+.bp-site-wide-message {
+        position: relative;
+}
+
 #buddypress div#message p,
-#sitewide-notice p {
+#sitewide-notice #message {
         background-color: #ffd;
         border: 1px solid #cb2;
         color: #440;
@@ -1405 +1411 @@
 .bp-site-wide-message #message p,
 .admin-bar-on #message p {
         padding-right: 25px;
-        position: relative;
 }
 
 .bp-site-wide-message #message button,