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

Timestamp:

09/19/2011 12:47:23 AM (14 years ago)

Author:

azaozz

Message:

Add TinyMCE command to handle opening of the upload/insert popup, fix the shortcut "Alt+Shift+M", fix the "image" button in DFW, fixes #17992, fixes #18697, see $17144

File:

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

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

@@ -595 +595 @@
     <?php
 
-        $media_link_type = 'image';
-        if ( is_multisite() && ( ( ! $mu_media_buttons = get_site_option( 'mu_media_buttons' ) ) || empty( $mu_media_buttons['image'] ) ) )
-            $media_link_type = 'media';
-
         $buttons = array(
             // format: title, onclick, show in both editors
@@ -608 +604 @@
             '1' => 'separator',
             'blockquote' => array( 'title' => __('Blockquote (Alt+Shift+Q)'), 'onclick' => 'fullscreen.blockquote();', 'both' => false ),
-            'image' => array( 'title' => __('Insert/edit image (Alt + Shift + M)'), 'onclick' => "jQuery('#add_{$media_link_type}').click();", 'both' => true ),
+            'image' => array( 'title' => __('Insert/edit image (Alt + Shift + M)'), 'onclick' => "fullscreen.medialib();", 'both' => true ),
             '2' => 'separator',
             'link' => array( 'title' => __('Insert/edit link (Alt + Shift + A)'), 'onclick' => 'fullscreen.link();', 'both' => true ),