vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-07-01 15:50:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@19172 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Ozz
2011-11-05 16:00:38 +00:00
parent f1bbad5d5b
commit bbb51b1807
4 changed files with 45 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
wp-includes/class-wp-editor.php
View File

@@ -139,35 +139,25 @@ class WP_Editor {
$first_run = false;
if ( $this->this_quicktags ) {
$qt_buttons = array();
$qtInit = array(
'id' => $editor_id,
'buttons' => '',
'disabled_buttons' => ''
'buttons' => ''
);
if ( is_array($set['quicktags']) )
$qtInit = array_merge($qtInit, $set['quicktags']);
$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 ( empty($qtInit['buttons']) )
$qtInit['buttons'] = 'strong,em,link,block,del,ins,img,ul,ol,li,code,more,spell,close';
if ( $set['dfw'] )
$qt_buttons[] = 'fullscreen';
$qtInit['buttons'] .= ',fullscreen';
$this->qt_buttons = array_merge( $this->qt_buttons, $qt_buttons );
$qtInit = apply_filters('quicktags_settings', $qtInit, $editor_id);
$this->qt_settings[$editor_id] = $qtInit;
$this->qt_buttons = array_merge( $this->qt_buttons, explode(',', $qtInit['buttons']) );
}
if ( $this->this_tinymce ) {