From 30bf87b24da93d5874f823e16f72526437795590 Mon Sep 17 00:00:00 2001 From: nacin Date: Mon, 21 Feb 2011 18:57:09 +0000 Subject: [PATCH] Ensure we're matching the complete theme directory when excluding parent templates from the theme editor. props chrisbliss18, fixes #16607 for trunk. git-svn-id: http://svn.automattic.com/wordpress/trunk@17471 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/theme-editor.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-admin/theme-editor.php b/wp-admin/theme-editor.php index 12681a7c0..7760d5071 100644 --- a/wp-admin/theme-editor.php +++ b/wp-admin/theme-editor.php @@ -180,7 +180,7 @@ if ($allowed_files) : $template_dir = $themes[$theme]['Template Dir']; foreach ( $themes[$theme]['Template Files'] as $template_file ) { // Don't show parent templates. - if ( $is_child_theme && strpos( $template_file, $themes[$theme]['Template Dir'] ) === 0 ) + if ( $is_child_theme && strpos( $template_file, trailingslashit( $template_dir ) ) === 0 ) continue; $description = trim( get_file_description($template_file) ); @@ -202,7 +202,7 @@ if ($allowed_files) : $stylesheet_dir = $themes[$theme]['Stylesheet Dir']; foreach ( $themes[$theme]['Stylesheet Files'] as $style_file ) { // Don't show parent styles. - if ( $is_child_theme && strpos( $style_file, $themes[$theme]['Template Dir'] ) === 0 ) + if ( $is_child_theme && strpos( $style_file, trailingslashit( $template_dir ) ) === 0 ) continue; $description = trim( get_file_description($style_file) );