Changes from trunk/wp-settings.php at r11268 to branches/2.8/wp-settings.php at r11661

File:

• branches/2.8/wp-settings.php (modified) (3 diffs)

branches/2.8/wp-settings.php

@@ -61 +61 @@
     $blog_id = 1;
 
-// Fix for IIS, which doesn't set REQUEST_URI
-if ( empty( $_SERVER['REQUEST_URI'] ) ) {
+// Fix for IIS when running with PHP ISAPI
+if ( empty( $_SERVER['REQUEST_URI'] ) || ( php_sapi_name() != 'cgi-fcgi' && preg_match( '/^Microsoft-IIS\//', $_SERVER['SERVER_SOFTWARE'] ) ) ) {
 
     // IIS Mod-Rewrite
@@ -317 +317 @@
     require_once(ABSPATH . WPINC . '/kses.php');
     require_once(ABSPATH . WPINC . '/pluggable.php');
+    require_once(ABSPATH . WPINC . '/formatting.php');
     wp_redirect($link);
     die(); // have to die here ~ Mark
@@ -529 +530 @@
 require (ABSPATH . WPINC . '/vars.php');
 
+// make taxonomies available to plugins and themes
+// @plugin authors: warning: this gets registered again on the init hook
+create_initial_taxonomies();
+
 // Check for hacks file if the option is enabled
 if ( get_option('hack_file') ) {