Ticket #6481: 6481.9.diff
File 6481.9.diff, 3.7 KB (added by , 10 years ago) |
---|
-
src/wp-admin/includes/schema.php
diff --git src/wp-admin/includes/schema.php src/wp-admin/includes/schema.php index 296a699..634f9a8 100644
function populate_options() { 397 397 'links_updated_date_format' => __('F j, Y g:i a'), 398 398 'comment_moderation' => 0, 399 399 'moderation_notify' => 1, 400 'permalink_structure' => ' ',400 'permalink_structure' => '/%year%/%monthnum%/%day%/%postname%/', 401 401 'gzipcompression' => 0, 402 402 'hack_file' => 0, 403 403 'blog_charset' => 'UTF-8', … … function populate_options() { 495 495 if ( is_multisite() ) { 496 496 /* translators: blog tagline */ 497 497 $options[ 'blogdescription' ] = sprintf(__('Just another %s site'), get_current_site()->site_name ); 498 $options[ 'permalink_structure' ] = '/%year%/%monthnum%/%day%/%postname%/';499 498 } 500 499 501 500 // Set autoload to no for these options -
src/wp-admin/includes/upgrade.php
diff --git src/wp-admin/includes/upgrade.php src/wp-admin/includes/upgrade.php index b72303a..279fda4 100644
function wp_install( $blog_title, $user_name, $user_email, $public, $deprecated 87 87 88 88 wp_install_defaults($user_id); 89 89 90 wp_install_verify_pretty_permalinks(); 91 90 92 flush_rewrite_rules(); 91 93 92 94 wp_new_blog_notification($blog_title, $guessurl, $user_id, ($email_password ? $user_password : __('The password you chose during the install.') ) ); … … As a new WordPress user, you should go to <a href=\"%s\">your dashboard</a> to d 260 262 } 261 263 endif; 262 264 265 if ( ! function_exists( 'wp_install_verify_pretty_permalinks' ) ) : 266 /** 267 * Verify pretty permalinks. 268 * 269 * This function will verify that pretty permalinks work. If pretty permalinks 270 * fail to work, the web-server will fall back to ugly permalinks by setting 271 * an empty permalink structure. 272 * 273 * @since 4.2.0 274 * 275 * @global WP_Rewrite $wp_rewrite WordPress rewrite component. 276 */ 277 function wp_install_verify_pretty_permalinks() { 278 global $wp_rewrite; 279 280 /* 281 * Flush rules with the hard option to force refresh of the web-server's 282 * rewrite config file (e.g. .htaccess or web.config). 283 */ 284 $wp_rewrite->flush_rules( true ); 285 286 /* 287 * Send a HEAD request to a random page on the site, and check whether 288 * the 'x-pingback' header is returned as expected. 289 */ 290 $response = wp_remote_get( site_url( '/wordpress-check-for-rewrites/' ) ); 291 $x_pingback_header = wp_remote_retrieve_header( $response, 'x-pingback' ); 292 $pretty_permalinks = $x_pingback_header && $x_pingback_header === get_bloginfo( 'pingback_url' ); 293 294 /* 295 * Fallback test that will send a HEAD request to the dummy post, 296 * and check whether the response code returns 200 as expected. 297 */ 298 if ( ! $pretty_permalinks ) { 299 $response = wp_remote_head( get_permalink( 1 ) ); 300 $pretty_permalinks = isset( $dummy_response['response']['code'] ) && 200 == $dummy_response['response']['code']; 301 } 302 303 /** 304 * Filter the pretty permalinks verification. 305 * 306 * @since 4.2.0 307 * 308 * @param bool $pretty_permalinks Pretty permalinks verified. 309 */ 310 $pretty_permalinks = (bool) apply_filters( 'wp_install_verify_pretty_permalinks', $pretty_permalinks ); 311 312 // Set an empty permalink structure to make it ugly again. 313 if ( ! $pretty_permalinks ) { 314 $wp_rewrite->set_permalink_structure(''); 315 } 316 } 317 endif; 318 263 319 if ( !function_exists('wp_new_blog_notification') ) : 264 320 /** 265 321 * {@internal Missing Short Description}} … … function dbDelta( $queries = '', $execute = true ) { 1679 1735 * 1680 1736 * @param array $iqueries An array of dbDelta insert or update SQL queries. 1681 1737 */ 1682 $iqueries = apply_filters( 'dbdelta_insert_queries', $iqueries );1738 $iqueries = 2( 'dbdelta_insert_queries', $iqueries ); 1683 1739 1684 1740 $global_tables = $wpdb->tables( 'global' ); 1685 1741 foreach ( $cqueries as $table => $qry ) {