Changeset 4606

Timestamp:

12/20/2012 01:18:32 PM (13 years ago)

Author:

johnjamesjacoby

Message:

Filter the TeenyMCE buttons to remove buttons that users cannot use. Maybe allow images; commented out for now.

Location:

trunk/includes/common

Files:

• kses.php (modified) (2 diffs)
• template-tags.php (modified) (3 diffs)

trunk/includes/common/kses.php

@@ -42 +42 @@
         'em'           => array(),
         'strong'       => array(),
-        'span'         => array(
-            'style'    => true
-        ),
         'del'          => array(
             'datetime' => true,
@@ -57 +54 @@
 
         // Images
+        /*
         'img'          => array(
             'src'      => true,
+            'border'   => true,
             'alt'      => true,
             'height'   => true,
             'width'    => true,
         )
+        */
     ) );
 }

trunk/includes/common/template-tags.php

@@ -1690 +1690 @@
 
             // Enable additional TinyMCE plugins before outputting the editor
-            add_filter( 'tiny_mce_plugins',  'bbp_get_tiny_mce_plugins' );
-            add_filter( 'teeny_mce_plugins', 'bbp_get_tiny_mce_plugins' );
+            add_filter( 'tiny_mce_plugins',  'bbp_get_tiny_mce_plugins'  );
+            add_filter( 'teeny_mce_plugins', 'bbp_get_tiny_mce_plugins'  );
+            add_filter( 'teeny_mce_buttons', 'bbp_get_teeny_mce_buttons' );
 
             // Output the editor
@@ -1708 +1709 @@
 
             // Remove additional TinyMCE plugins after outputting the editor
-            remove_filter( 'tiny_mce_plugins',  'bbp_get_tiny_mce_plugins' );
-            remove_filter( 'teeny_mce_plugins', 'bbp_get_tiny_mce_plugins' );
+            remove_filter( 'tiny_mce_plugins',  'bbp_get_tiny_mce_plugins'  );
+            remove_filter( 'teeny_mce_plugins', 'bbp_get_tiny_mce_plugins'  );
+            remove_filter( 'teeny_mce_buttons', 'bbp_get_teeny_mce_buttons' );
 
         /**
@@ -1760 +1762 @@
 
     return apply_filters( 'bbp_get_tiny_mce_plugins', $plugins );
+}
+
+/**
+ * Edit TinyMCE buttons to match allowedtags
+ *
+ * @since bbPress (r4605)
+ *
+ * @param array $buttons
+ * @see teeny_mce_buttons
+ * @return array
+ */
+function bbp_get_teeny_mce_buttons( $buttons = array() ) {
+
+    // Remove some buttons from TeenyMCE
+    $buttons = array_diff( $buttons, array(
+        'underline',
+        'justifyleft',
+        'justifycenter',
+        'justifyright'
+    ) );
+
+    // Images?
+    //array_push( $buttons, 'image' );
+
+    return apply_filters( 'bbp_get_teeny_mce_buttons', $buttons );
 }