Theme Editor fails to list child theme files if the child theme dir starts with the parent theme dir name

[chrisjean]

r16714 introduced a new bug. The following line of code (used for both template and style files) fails when compared against child themes that start with the same name as their parent (such as Theme and ThemeChild):

if ( $is_child_theme && strpos( $style_file, $themes[$theme]['Template Dir'] ) === 0 )

This results in no files being listed for the child theme.

The fix-child-theme-editor.diff patch addresses this issue by using trailingslashit on the template directory string, thus allowing a proper check to be done:

if ( $is_child_theme && strpos( $style_file, trailingslashit( $themes[$theme]['Template Dir'] ) ) === 0 )

[chrisbliss18]

I should clarify that the name I refer to in the initial patch isn't the theme name itself but the directory name.

[nacin]

Thanks Chris. Tested, looks good.

[chrisbliss18]

Thanks for your rapid response nacin. This would be a problem for many of our users if it made it into release.

[nacin]

Also testing this on a PC due to the change in directory separators. Looks good. Template file looks like this:

C:\xampp\htdocs\trunk/wp-content/themes/twentyten/404.php

And template dir looks like:

C:\xampp\htdocs\trunk/wp-content/themes/twentyten

Adding a trailing slash takes care of it.

(At worst, it fails, and the parent template shows anyway.)

Looking into this further, it looks like I set up a variable but never used it. Going to clean that up on commit.

[nacin]

(In [17470]) 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.

[nacin]

(In [17471]) Ensure we're matching the complete theme directory when excluding parent templates from the theme editor. props chrisbliss18, fixes #16607 for trunk.