diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-07-07 17:16:43 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-07-07 17:16:43 +0000 |
| commit | 6081c995737157ea06244568c48570148b08258f (patch) | |
| tree | c74a90925305ffff924a8261efd1d92265e3146c /wp-admin/includes | |
| parent | 62cf455ec3bed02f518048f8ddca91a23e6b95a4 (diff) | |
| download | wordpress-mu-6081c995737157ea06244568c48570148b08258f.tar.gz wordpress-mu-6081c995737157ea06244568c48570148b08258f.tar.xz wordpress-mu-6081c995737157ea06244568c48570148b08258f.zip | |
WP Merge to revision 8266
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1355 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-admin/includes')
| -rw-r--r-- | wp-admin/includes/media.php | 1 | ||||
| -rw-r--r-- | wp-admin/includes/plugin.php | 10 | ||||
| -rw-r--r-- | wp-admin/includes/widgets.php | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php index a79944a..89a3040 100644 --- a/wp-admin/includes/media.php +++ b/wp-admin/includes/media.php @@ -720,6 +720,7 @@ function get_media_item( $attachment_id, $args = null ) { } $display_title = ( !empty( $title ) ) ? $title : $filename; // $title shouldn't ever be empty, but just in case + $display_title = wp_html_excerpt($display_title, 100); $item = " $type diff --git a/wp-admin/includes/plugin.php b/wp-admin/includes/plugin.php index 72acd45..2822dac 100644 --- a/wp-admin/includes/plugin.php +++ b/wp-admin/includes/plugin.php @@ -470,18 +470,16 @@ function get_plugin_page_hookname( $plugin_page, $parent_page ) { $parent = get_admin_page_parent(); + $page_type = 'admin'; if ( empty ( $parent_page ) || 'admin.php' == $parent_page ) { if ( isset( $admin_page_hooks[$plugin_page] )) $page_type = 'toplevel'; else if ( isset( $admin_page_hooks[$parent] )) $page_type = $admin_page_hooks[$parent]; - } else - if ( isset( $admin_page_hooks[$parent_page] ) ) { - $page_type = $admin_page_hooks[$parent_page]; - } else { - $page_type = 'admin'; - } + } else if ( isset( $admin_page_hooks[$parent_page] ) ) { + $page_type = $admin_page_hooks[$parent_page]; + } $plugin_name = preg_replace( '!\.php!', '', $plugin_page ); diff --git a/wp-admin/includes/widgets.php b/wp-admin/includes/widgets.php index 79a4f1a..52d1d7b 100644 --- a/wp-admin/includes/widgets.php +++ b/wp-admin/includes/widgets.php @@ -64,7 +64,7 @@ function wp_list_widgets( $show = 'all', $_search = false ) { if ( 'all' == $show && $is_multi ) { // it's a multi-widget. We only need to show it in the list once. $already_shown[] = $widget['callback']; - $num = (int) array_pop( explode( '-', $widget['id'] ) ); + $num = (int) array_pop( $ids = explode( '-', $widget['id'] ) ); $id_base = $wp_registered_widget_controls[$widget['id']]['id_base']; // so that we always add a new one when clicking "add" while ( isset($wp_registered_widgets["$id_base-$num"]) ) |