Changeset 17470

Timestamp:

02/21/2011 06:55:48 PM (14 years ago)

Author:

nacin

Message:

Ensure we're matching the complete theme directory when excluding parent templates from the theme editor. props chrisbliss18, fixes #16607 for the 3.1 branch.

File:

• branches/3.1/wp-admin/theme-editor.php (modified) (2 diffs)

branches/3.1/wp-admin/theme-editor.php

@@ -181 +181 @@
     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;
 
@@ -203 +203 @@
     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;