Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-26 22:32:52 +02:00
Code Issues Projects Releases Wiki Activity

wp_install_maybe_enable_pretty_permalinks() should have a consistent @return value.

Browse Source 
props DrewAPicture.
fixes #6481. see #31888.
Built from https://develop.svn.wordpress.org/trunk@32027


git-svn-id: http://core.svn.wordpress.org/trunk@32006 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2015-04-05 14:49:53 +00:00
parent 1a2b9e6d15
commit 443760252b
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -265,20 +265,22 @@ As a new WordPress user, you should go to <a href=\"%s\">your dashboard</a> to d
endif;
/**
* Enable pretty permalinks.
* Maybe enable pretty permalinks on install.
*
* If after enabling pretty permalinks don't work, fallback to query-string permalinks.
*
* @since 4.2.0
*
* @global WP_Rewrite $wp_rewrite WordPress rewrite component.
*
* @return bool Whether pretty permalinks are enabled. False otherwise.
*/
function wp_install_maybe_enable_pretty_permalinks() {
global $wp_rewrite;
// Bail if a permalink structure is already enabled.
if ( get_option( 'permalink_structure' ) ) {
return;
return true;
}
/*
@ -305,6 +307,7 @@ function wp_install_maybe_enable_pretty_permalinks() {
// Test against a real WordPress Post, or if none were created, a random 404 page.
$test_url = get_permalink( 1 );
if ( ! $test_url ) {
$test_url = home_url( '/wordpress-check-for-rewrites/' );
}
@ -331,6 +334,8 @@ function wp_install_maybe_enable_pretty_permalinks() {
*/
$wp_rewrite->set_permalink_structure( '' );
$wp_rewrite->flush_rules( true );
return false;
}
if ( !function_exists('wp_new_blog_notification') ) :

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.2-beta4-32026';
$wp_version = '4.2-beta4-32027';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.