Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Refresh - Validate URL in Locate Template #6502

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shail-mehta wants to merge 15 commits into
base: trunk
Choose a base branch
from
Open

Refresh - Validate URL in Locate Template #6502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
2929dd1
Validate URL in Locate Template
shail-mehta May 4, 2024
3a3eae0
Removed Empty Space
shail-mehta May 4, 2024
1935aa2
Validate URL in Locate Template
shail-mehta May 4, 2024
1ea7783
Fix Spacing Issue
shail-mehta May 4, 2024
6747fce
Fix Spacing Issue
shail-mehta May 4, 2024
116103c
Validate URL in Locate Template
shail-mehta May 4, 2024
c276e0f
Validate URL in Locate Template
shail-mehta May 5, 2024
8ae3447
Fixed spacing issue
shail-mehta May 5, 2024
2965b9e
added-suggested-change
shail-mehta May 30, 2024
10fab3f
Add some automated tests
aaronjorbin Aug 5, 2024
031b6af
add visibility to dataprovider
aaronjorbin Aug 5, 2024
e289774
Merge branch 'trunk' of github.com:WordPress/wordpress-develop into v…
aaronjorbin Aug 5, 2024
9621b02
Merge branch 'trunk' of github.com:WordPress/wordpress-develop into v…
aaronjorbin Aug 6, 2024
a025ae0
Merge branch 'trunk' of github.com:WordPress/wordpress-develop into v…
aaronjorbin Aug 13, 2024
9f22bbd
Merge branch 'trunk' into validate-url-in-locate-template
joemcgill Feb 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions src/wp-includes/template.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -729,15 +729,18 @@ function locate_template( $template_names, $load = false, $load_once = true, $ar
if ( ! $template_name ) {
continue;
}
if ( file_exists( $wp_stylesheet_path . '/' . $template_name ) ) {
$located = $wp_stylesheet_path . '/' . $template_name;
break;
} elseif ( $is_child_theme && file_exists( $wp_template_path . '/' . $template_name ) ) {
$located = $wp_template_path . '/' . $template_name;
$stylesheet = $wp_stylesheet_path . '/' . $template_name;
$template = $wp_template_path . '/' . $template_name;
$template_compat = ABSPATH . WPINC . '/theme-compat/' . $template_name;

if ( file_exists( $stylesheet ) && 0 === validate_file( $stylesheet ) ) {
$located = $stylesheet;
break;
} elseif ( file_exists( ABSPATH . WPINC . '/theme-compat/' . $template_name ) ) {
$located = ABSPATH . WPINC . '/theme-compat/' . $template_name;
} elseif ( $is_child_theme && file_exists( $template ) && 0 === validate_file( $template ) ) {
$located = $template;
break;
} elseif ( file_exists( $template_compat ) && 0 === validate_file( $template_compat ) ) {
$located = $template_compat;
}
}

Expand Down
39 changes: 39 additions & 0 deletions tests/phpunit/tests/template.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,6 +494,45 @@ public function test_locate_template_uses_current_theme() {
$this->assertSame( $new_theme->get_stylesheet_directory() . '/index.php', locate_template( $template_names ), 'Incorrect index template found in theme after switch.' );
}

/**
* Tests that `locate_template()` uses the current theme even after switching the theme.
*
* @dataProvider data_locate_template_only_loads_theme_files
*
* @ticket 58905
*
* @covers ::locate_template
Comment on lines +500 to +504

@mukeshpanchal27 mukeshpanchal27 Aug 26, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
* @dataProvider data_locate_template_only_loads_theme_files
*
* @ticket 58905
*
* @covers ::locate_template
* @ticket 58905
*
* @covers ::locate_template
*
* @dataProvider data_locate_template_only_loads_theme_files

Correct the annotation order.

*
* @param string $template_name Template name to locate.
* @param bool $located_empty Whether the located template should be empty.
*/
public function test_locate_template_only_loads_theme_files( $template_name, $located_empty ) {
$located_return = locate_template( $template_name );
$this->assertSame( empty( $located_return ), $located_empty );
}

/**
* Data provider for `test_locate_template_only_loads_theme_files()`.
*
* @return array
*/
public function data_locate_template_only_loads_theme_files() {
return array(
'file that is in theme compat so will always return' => array(
'header.php',
false,
),
'something that does not exist' => array(
'the_limit_according_to_cady_heron.php',
true,
),
'file that is not in a theme path' => array(
WP_PLUGIN_DIR . '/hello.php',
true,
),
);
}

public function assertTemplateHierarchy( $url, array $expected, $message = '' ) {
$this->go_to( $url );
$hierarchy = $this->get_template_hierarchy();
Expand Down