WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Theme Editor: ensure that files named `index.php` in theme subfolders are not labeled as "Main Index Template" 

Props MikeHansenMe, wonderboymusic, bravokeyl, Shelob9.
Fixes #27201.

Built from https://develop.svn.wordpress.org/trunk@34658


git-svn-id: http://core.svn.wordpress.org/trunk@34622 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2015-09-28 03:11:24 +00:00
parent 6cde1a05cb
commit 8bb4c2c2e9
3 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
wp-admin/includes/file.php
View File

@ -51,18 +51,21 @@ $wp_file_descriptions = array(
* *
* @global array $wp_file_descriptions * @global array $wp_file_descriptions
* @param string $file Filesystem path or filename * @param string $file Filesystem path or filename
* @return string Description of file from $wp_file_descriptions or basename of $file if description doesn't exist * @return string Description of file from $wp_file_descriptions or basename of $file if description doesn't exist.
* Appends 'Page Template' to basename of $file if the file is a page template
*/ */
function get_file_description( $file ) { function get_file_description( $file ) {
global $wp_file_descriptions; global $wp_file_descriptions, $allowed_files;
if ( isset( $wp_file_descriptions[basename( $file )] ) ) { $relative_pathinfo = pathinfo( $file );
return $wp_file_descriptions[basename( $file )]; $file_path = $allowed_files[ $file ];
} if ( isset( $wp_file_descriptions[ basename( $file ) ] ) && '.' === $relative_pathinfo['dirname'] ) {
elseif ( file_exists( $file ) && is_file( $file ) ) { return $wp_file_descriptions[ basename( $file ) ];
$template_data = implode( '', file( $file ) ); } elseif ( file_exists( $file_path ) && is_file( $file_path ) ) {
if ( preg_match( '|Template Name:(.*)$|mi', $template_data, $name )) $template_data = implode( '', file( $file_path ) );
return sprintf( __( '%s Page Template' ), _cleanup_header_comment($name[1]) ); if ( preg_match( '|Template Name:(.*)$|mi', $template_data, $name ) ) {
return sprintf( __( '%s Page Template' ), _cleanup_header_comment( $name[1] ) );
}
} }
return trim( basename( $file ) ); return trim( basename( $file ) );

12
wp-admin/theme-editor.php
View File

@ -25,7 +25,7 @@ get_current_screen()->add_help_tab( array(
'title' => __('Overview'), 'title' => __('Overview'),
'content' => 'content' =>
'<p>' . __('You can use the Theme Editor to edit the individual CSS and PHP files which make up your theme.') . '</p> '<p>' . __('You can use the Theme Editor to edit the individual CSS and PHP files which make up your theme.') . '</p>
<p>' . __('Begin by choosing a theme to edit from the dropdown menu and clicking Select. A list then appears of all the template files. Clicking once on any file name causes the file to appear in the large Editor box.') . '</p> <p>' . __("Begin by choosing a theme to edit from the dropdown menu and clicking Select. A list then appears of the theme's template files. Clicking once on any file name causes the file to appear in the large Editor box.") . '</p>
<p>' . __('For PHP files, you can use the Documentation dropdown to select from functions recognized in that file. Look Up takes you to a web page with reference material about that particular function.') . '</p> <p>' . __('For PHP files, you can use the Documentation dropdown to select from functions recognized in that file. Look Up takes you to a web page with reference material about that particular function.') . '</p>
<p id="newcontent-description">' . __( 'In the editing area the Tab key enters a tab character. To move below this area by pressing Tab, press the Esc key followed by the Tab key. In some cases the Esc key will need to be pressed twice before the Tab key will allow you to continue.' ) . '</p> <p id="newcontent-description">' . __( 'In the editing area the Tab key enters a tab character. To move below this area by pressing Tab, press the Esc key followed by the Tab key. In some cases the Esc key will need to be pressed twice before the Tab key will allow you to continue.' ) . '</p>
<p>' . __('After typing in your edits, click Update File.') . '</p> <p>' . __('After typing in your edits, click Update File.') . '</p>
@ -125,7 +125,7 @@ default:
<div id="message" class="updated notice is-dismissible"><p><?php _e( 'File edited successfully.' ) ?></p></div> <div id="message" class="updated notice is-dismissible"><p><?php _e( 'File edited successfully.' ) ?></p></div>
<?php endif; <?php endif;
$description = get_file_description( $file ); $description = get_file_description( $relative_file );
$file_show = array_search( $file, array_filter( $allowed_files ) ); $file_show = array_search( $file, array_filter( $allowed_files ) );
if ( $description != $file_show ) if ( $description != $file_show )
$description .= ' <span>(' . $file_show . ')</span>'; $description .= ' <span>(' . $file_show . ')</span>';
@ -177,12 +177,14 @@ if ( $allowed_files ) :
if ( 'style.css' == $filename ) if ( 'style.css' == $filename )
echo "\t</ul>\n\t<h2>" . _x( 'Styles', 'Theme stylesheets in theme editor' ) . "</h2>\n\t<ul>\n"; echo "\t</ul>\n\t<h2>" . _x( 'Styles', 'Theme stylesheets in theme editor' ) . "</h2>\n\t<ul>\n";
$file_description = get_file_description( $absolute_filename ); $file_description = get_file_description( $filename );
if ( $file_description != basename( $filename ) ) if ( $filename !== basename( $absolute_filename ) || $file_description !== $filename ) {
$file_description .= '<br /><span class="nonessential">(' . $filename . ')</span>'; $file_description .= '<br /><span class="nonessential">(' . $filename . ')</span>';
}
if ( $absolute_filename == $file ) if ( $absolute_filename === $file ) {
$file_description = '<span class="highlight">' . $file_description . '</span>'; $file_description = '<span class="highlight">' . $file_description . '</span>';
}
?> ?>
<li><a href="theme-editor.php?file=<?php echo urlencode( $filename ) ?>&amp;theme=<?php echo urlencode( $stylesheet ) ?>"><?php echo $file_description; ?></a></li> <li><a href="theme-editor.php?file=<?php echo urlencode( $filename ) ?>&amp;theme=<?php echo urlencode( $stylesheet ) ?>"><?php echo $file_description; ?></a></li>
<?php <?php

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.4-alpha-34657'; $wp_version = '4.4-alpha-34658';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.