The new wp_install_maybe_enable_pretty_permalinks() function doesn't need to be pluggable.

See #6481. Props nacin, valendesigns

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


git-svn-id: http://core.svn.wordpress.org/trunk@31140 1a063a9b-81f0-0310-95a4-ce76da25c4cd

wp-admin/includes/upgrade.php

@@ -262,7 +262,6 @@ As a new WordPress user, you should go to <a href=\"%s\">your dashboard</a> to d
 }
 endif;
 
-if ( ! function_exists( 'wp_install_maybe_enable_pretty_permalinks' ) ) :
 /**
  * Enable pretty permalinks if available.
  *
@@ -329,7 +328,6 @@ function wp_install_maybe_enable_pretty_permalinks() {
 	$wp_rewrite->set_permalink_structure( '' );
 	$wp_rewrite->flush_rules( true );
 }
-endif;
 
 if ( !function_exists('wp_new_blog_notification') ) :
 /**

wp-includes/version.php

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