From a114d0929b342c1fcc61dde94b90062a99e474b0 Mon Sep 17 00:00:00 2001
From: Dion Hulse <wordpress@dd32.id.au>
Date: Mon, 12 Jan 2015 04:31:23 +0000
Subject: [PATCH] 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 | 2 --
 wp-includes/version.php       | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php
index 1c0f9f770f..abcd39e88c 100644
--- a/wp-admin/includes/upgrade.php
+++ b/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') ) :
 /**
diff --git a/wp-includes/version.php b/wp-includes/version.php
index b70e28b7ba..40afc488db 100644
--- a/wp-includes/version.php
+++ b/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.