From 96db88e1b844773d0eee2538b624c6b672cc8a20 Mon Sep 17 00:00:00 2001 From: dd32 Date: Fri, 19 Mar 2010 08:03:52 +0000 Subject: [PATCH] Highlight correct submenu for Theme Installs. Fix PHP Notice for unset object properties (requires among others may not be set). git-svn-id: http://svn.automattic.com/wordpress/trunk@13763 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/theme-install.php | 7 +++++-- wp-admin/update.php | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/wp-admin/includes/theme-install.php b/wp-admin/includes/theme-install.php index 7d5436ec38..f7256061b1 100644 --- a/wp-admin/includes/theme-install.php +++ b/wp-admin/includes/theme-install.php @@ -455,8 +455,11 @@ function install_theme_information() { // Sanitize HTML foreach ( (array)$api->sections as $section_name => $content ) $api->sections[$section_name] = wp_kses($content, $themes_allowedtags); - foreach ( array('version', 'author', 'requires', 'tested', 'homepage', 'downloaded', 'slug') as $key ) - $api->$key = wp_kses($api->$key, $themes_allowedtags); + + foreach ( array('version', 'author', 'requires', 'tested', 'homepage', 'downloaded', 'slug') as $key ) { + if ( isset($api->$key) ) + $api->$key = wp_kses($api->$key, $themes_allowedtags); + } iframe_header( __('Theme Install') ); diff --git a/wp-admin/update.php b/wp-admin/update.php index 43f6e13f8b..aa1a7bf0c2 100644 --- a/wp-admin/update.php +++ b/wp-admin/update.php @@ -205,7 +205,7 @@ if ( isset($_GET['action']) ) { wp_enqueue_script('theme-preview'); $title = __('Install Themes'); $parent_file = 'themes.php'; - $submenu_file = 'theme-install.php'; + $submenu_file = 'themes.php'; require_once('admin-header.php'); $title = sprintf( __('Installing Theme: %s'), $api->name . ' ' . $api->version );