Changeset 19172 for trunk/wp-includes/class-wp-editor.php

Timestamp:

11/05/2011 04:00:38 PM (13 years ago)

Author:

azaozz

Message:

Improve handling of init and adding buttons to Quicktags, fixes #19098

File:

• trunk/wp-includes/class-wp-editor.php (modified) (2 diffs)

trunk/wp-includes/class-wp-editor.php

@@ -140 +140 @@
 
         if ( $this->this_quicktags ) {
-            $qt_buttons = array();
 
             $qtInit = array(
                 'id' => $editor_id,
-                'buttons' => '',
-                'disabled_buttons' => ''
+                'buttons' => ''
             );
 
@@ -151 +149 @@
                 $qtInit = array_merge($qtInit, $set['quicktags']);
 
-            $qtInit = apply_filters( 'quicktags_settings', $qtInit, $editor_id );
-
+            if ( empty($qtInit['buttons']) )
+                $qtInit['buttons'] = 'strong,em,link,block,del,ins,img,ul,ol,li,code,more,spell,close';
+
+            if ( $set['dfw'] )
+                $qtInit['buttons'] .= ',fullscreen';
+
+            $qtInit = apply_filters('quicktags_settings', $qtInit, $editor_id);
             $this->qt_settings[$editor_id] = $qtInit;
 
-            if ( !empty($qtInit['buttons']) || !empty($qtInit['disabled_buttons']) ) {
-                if ( strpos( ',' . $qtInit['buttons'] . ',', ',link,' ) !== false )
-                    $qt_buttons[] = 'link';
-
-                if ( strpos( ',' . $qtInit['disabled_buttons'] . ',', ',link,' ) !== false )
-                    $qt_buttons = array();
-            } else {
-                $qt_buttons[] = 'link';
-            }
-
-            if ( $set['dfw'] )
-                $qt_buttons[] = 'fullscreen';
-
-            $this->qt_buttons = array_merge( $this->qt_buttons, $qt_buttons );
+            $this->qt_buttons = array_merge( $this->qt_buttons, explode(',', $qtInit['buttons']) );
         }