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

Permalinks: In `wp_install_maybe_enable_pretty_permalinks()`: 

* Use `get_page_by_path()` instead of a hardcoded ID, which may not always exist.
* Remove the "test against a random 404 page" part, which is no longer relevant after [34442].

Fixes #36628.
Built from https://develop.svn.wordpress.org/trunk@38109


git-svn-id: http://core.svn.wordpress.org/trunk@38050 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2016-07-19 23:12:32 +00:00
parent 65ffc1ff42
commit 6c7a60ffb4
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wp-admin/includes/upgrade.php
View File

@ -320,11 +320,12 @@ function wp_install_maybe_enable_pretty_permalinks() {
*/
$wp_rewrite->flush_rules( true );
// Test against a real WordPress Post, or if none were created, a random 404 page.
$test_url = get_permalink( 1 );
$test_url = '';
if ( ! $test_url ) {
$test_url = home_url( '/wordpress-check-for-rewrites/' );
// Test against a real WordPress Post
$first_post = get_page_by_path( sanitize_title( _x( 'hello-world', 'Default post slug' ) ), OBJECT, 'post' );
if ( $first_post ) {
$test_url = get_permalink( $first_post->ID );
}
/*

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.6-beta3-38108';
$wp_version = '4.6-beta3-38109';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.