Ticket #7795: 7795.2.patch

src/bp-messages/bp-messages-filters.php

@@ -18 +18 @@
 add_filter( 'bp_get_message_thread_excerpt',        'wp_filter_kses', 1 );
 add_filter( 'bp_get_messages_subject_value',        'wp_filter_kses', 1 );
 add_filter( 'bp_get_messages_content_value',        'wp_filter_kses', 1 );
-add_filter( 'bp_get_the_thread_message_content',    'wp_filter_kses', 1 );
-
-add_filter( 'messages_message_content_before_save', 'wp_filter_kses', 1 );
 add_filter( 'messages_message_subject_before_save', 'wp_filter_kses', 1 );
-add_filter( 'messages_notice_message_before_save',  'wp_filter_kses', 1 );
 add_filter( 'messages_notice_subject_before_save',  'wp_filter_kses', 1 );
-
-add_filter( 'bp_get_the_thread_message_content',    'wp_filter_kses', 1 );
 add_filter( 'bp_get_the_thread_subject',            'wp_filter_kses', 1 );
 
+add_filter( 'bp_get_the_thread_message_content',    'bp_messages_filter_kses', 1 );
+add_filter( 'messages_message_content_before_save', 'bp_messages_filter_kses', 1 );
+add_filter( 'messages_notice_message_before_save',  'bp_messages_filter_kses', 1 );
+add_filter( 'bp_get_message_thread_content',        'bp_messages_filter_kses', 1 );
+
 add_filter( 'messages_message_content_before_save', 'force_balance_tags' );
 add_filter( 'messages_message_subject_before_save', 'force_balance_tags' );
 add_filter( 'messages_notice_message_before_save',  'force_balance_tags' );
@@ -45 +44 @@
 add_filter( 'bp_get_message_thread_subject',     'wptexturize' );
 add_filter( 'bp_get_message_thread_excerpt',     'wptexturize' );
 add_filter( 'bp_get_the_thread_message_content', 'wptexturize' );
+add_filter( 'bp_get_message_thread_content',     'wptexturize' );
 
 add_filter( 'bp_get_message_notice_subject',     'convert_smilies', 2 );
 add_filter( 'bp_get_message_notice_text',        'convert_smilies', 2 );
 add_filter( 'bp_get_message_thread_subject',     'convert_smilies', 2 );
 add_filter( 'bp_get_message_thread_excerpt',     'convert_smilies', 2 );
 add_filter( 'bp_get_the_thread_message_content', 'convert_smilies', 2 );
+add_filter( 'bp_get_message_thread_content',     'convert_smilies', 2 );
 
 add_filter( 'bp_get_message_notice_subject',     'convert_chars' );
 add_filter( 'bp_get_message_notice_text',        'convert_chars' );
 add_filter( 'bp_get_message_thread_subject',     'convert_chars' );
 add_filter( 'bp_get_message_thread_excerpt',     'convert_chars' );
 add_filter( 'bp_get_the_thread_message_content', 'convert_chars' );
+add_filter( 'bp_get_message_thread_content',     'convert_chars' );
 
 add_filter( 'bp_get_message_notice_text',        'make_clickable', 9 );
 add_filter( 'bp_get_the_thread_message_content', 'make_clickable', 9 );
+add_filter( 'bp_get_message_thread_content',     'make_clickable', 9 );
 
 add_filter( 'bp_get_message_notice_text',        'wpautop' );
 add_filter( 'bp_get_the_thread_message_content', 'wpautop' );
+add_filter( 'bp_get_message_thread_content',     'wpautop' );
 
-add_filter( 'bp_get_message_notice_subject',          'stripslashes_deep' );
-add_filter( 'bp_get_message_notice_text',             'stripslashes_deep' );
-add_filter( 'bp_get_message_thread_subject',          'stripslashes_deep' );
-add_filter( 'bp_get_message_thread_excerpt',          'stripslashes_deep' );
-add_filter( 'bp_get_message_get_recipient_usernames', 'stripslashes_deep' );
-add_filter( 'bp_get_messages_subject_value',          'stripslashes_deep' );
-add_filter( 'bp_get_messages_content_value',          'stripslashes_deep' );
-add_filter( 'bp_get_the_thread_message_content',      'stripslashes_deep' );
-add_filter( 'bp_get_the_thread_subject',              'stripslashes_deep' );
+add_filter( 'bp_get_message_notice_subject',          'stripslashes_deep'    );
+add_filter( 'bp_get_message_notice_text',             'stripslashes_deep'    );
+add_filter( 'bp_get_message_thread_subject',          'stripslashes_deep'    );
+add_filter( 'bp_get_message_thread_excerpt',          'stripslashes_deep'    );
+add_filter( 'bp_get_message_get_recipient_usernames', 'stripslashes_deep'    );
+add_filter( 'bp_get_messages_subject_value',          'stripslashes_deep'    );
+add_filter( 'bp_get_messages_content_value',          'stripslashes_deep'    );
+add_filter( 'bp_get_the_thread_message_content',      'stripslashes_deep'    );
+add_filter( 'bp_get_the_thread_subject',              'stripslashes_deep'    );
+add_filter( 'bp_get_message_thread_content',          'stripslashes_deep', 1 );
 
 /**
  * Enforce limitations on viewing private message contents
@@ -98 +103 @@
         return $args;
 }
 add_filter( 'bp_after_has_message_threads_parse_args', 'bp_messages_enforce_current_user', 5 );
+
+/**
+ * Custom kses filtering for message content.
+ *
+ * @since 3.0.0
+ *
+ * @param string $content The message content.
+ * @return string         The filtered message content.
+ */
+function bp_messages_filter_kses( $content ) {
+        global $allowedtags;
+
+        return wp_kses( $content, array_merge( $allowedtags, array(
+                'a' => array(
+                        'aria-label'      => true,
+                        'class'           => true,
+                        'data-bp-tooltip' => true,
+                        'id'              => true,
+                        'rel'             => true,
+                        'title'           => true,
+                ),
+                'img' => array(
+                        'src'    => true,
+                        'alt'    => true,
+                        'width'  => true,
+                        'height' => true,
+                        'class'  => true,
+                        'id'     => true,
+                ),
+                'span'=> array(
+                        'class'          => true,
+                        'data-livestamp' => true,
+                ),
+                'p'  => true,
+                'ul' => true,
+                'ol' => true,
+                'li' => true,
+        ) ) );
+}

src/bp-templates/bp-nouveau/buddypress/common/js-templates/messages/index.php

@@ -34 +34 @@
 
 <script type="text/html" id="tmpl-bp-messages-editor">
         <?php
-        // Temporarily filter the editor
-        add_filter( 'mce_buttons', 'bp_nouveau_mce_buttons', 10, 1 );
+        // Add a temporary filter on editor buttons
+        add_filter( 'mce_buttons', 'bp_nouveau_messages_mce_buttons', 10, 1 );
 
         wp_editor(
                 '',
@@ -51 +51 @@
                         'textarea_rows' => 5,
                 )
         );
-        // Temporarily filter the editor
-        remove_filter( 'mce_buttons', 'bp_nouveau_mce_buttons', 10, 1 );
+        // Remove the temporary filter on editor buttons
+        remove_filter( 'mce_buttons', 'bp_nouveau_messages_mce_buttons', 10, 1 );
         ?>
 </script>
 

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

@@ -3064 +3064 @@
 }
 
 .bp-messages-content #thread-preview .preview-message {
-        clear: both;
+        overflow: hidden;
 }
 
 .bp-messages-content #thread-preview .preview-content {
@@ -3133 +3133 @@
 }
 
 .bp-messages-content #bp-message-thread-list .message-content {
-        clear: both;
+        overflow: hidden;
         margin: 1em auto 0;
         width: 90%;
 }

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

@@ -3064 +3064 @@
 }
 
 .bp-messages-content #thread-preview .preview-message {
-        clear: both;
+        overflow: hidden;
 }
 
 .bp-messages-content #thread-preview .preview-content {
@@ -3133 +3133 @@
 }
 
 .bp-messages-content #bp-message-thread-list .message-content {
-        clear: both;
+        overflow: hidden;
         margin: 1em auto 0;
         width: 90%;
 }

src/bp-templates/bp-nouveau/includes/messages/functions.php

@@ -299 +299 @@
 }
 
 /**
+ * Disable the WP Editor buttons not allowed in messages content.
+ *
  * @since 3.0.0
+ *
+ * @param array $buttons The WP Editor buttons list.
+ * @param array          The filtered WP Editor buttons list.
  */
-function bp_nouveau_mce_buttons( $buttons = array() ) {
+function bp_nouveau_messages_mce_buttons( $buttons = array() ) {
         $remove_buttons = array(
                 'wp_more',
                 'spellchecker',
                 'wp_adv',
                 'fullscreen',
+                'alignleft',
+                'alignright',
+                'aligncenter',
+                'formatselect',
         );
 
         // Remove unused buttons

src/bp-templates/bp-nouveau/includes/messages/loader.php

@@ -102 +102 @@
 
                 // Messages
                 add_filter( 'bp_messages_admin_nav', 'bp_nouveau_messages_adjust_admin_nav', 10, 1 );
-
-                remove_filter( 'messages_notice_message_before_save', 'wp_filter_kses', 1 );
-                remove_filter( 'messages_message_content_before_save', 'wp_filter_kses', 1 );
-                remove_filter( 'bp_get_the_thread_message_content', 'wp_filter_kses', 1 );
-
-                add_filter( 'messages_notice_message_before_save', 'wp_filter_post_kses', 1 );
-                add_filter( 'messages_message_content_before_save', 'wp_filter_post_kses', 1 );
-                add_filter( 'bp_get_the_thread_message_content', 'wp_filter_post_kses', 1 );
-                add_filter( 'bp_get_message_thread_content', 'wp_filter_post_kses', 1 );
-                add_filter( 'bp_get_message_thread_content', 'wptexturize' );
-                add_filter( 'bp_get_message_thread_content', 'stripslashes_deep', 1 );
-                add_filter( 'bp_get_message_thread_content', 'convert_smilies', 2 );
-                add_filter( 'bp_get_message_thread_content', 'convert_chars' );
-                add_filter( 'bp_get_message_thread_content', 'make_clickable', 9 );
-                add_filter( 'bp_get_message_thread_content', 'wpautop' );
         }
 }
 

src/bp-templates/bp-nouveau/sass/_nouveau_messages.scss

@@ -192 +192 @@
                 margin-top: $marg-lrg;
 
                 .preview-message {
-                        clear: both;
+                        overflow: hidden;
                 }
 
                 .preview-content {
@@ -263 +263 @@
                 }
 
                 .message-content {
-                        clear: both;
+                        overflow: hidden;
                         margin: 1em auto 0;
                         width: 90%;
                 }