Changes from trunk/wp-settings.php at r8211 to branches/2.6/wp-settings.php at r8566

File:

• branches/2.6/wp-settings.php (modified) (2 diffs)

branches/2.6/wp-settings.php

@@ -69 +69 @@
     else
     {
+        // Use ORIG_PATH_INFO if there is no PATH_INFO
+        if ( !isset($_SERVER['PATH_INFO']) && isset($_SERVER['ORIG_PATH_INFO']) )
+            $_SERVER['PATH_INFO'] = $_SERVER['ORIG_PATH_INFO'];
+
         // Some IIS + PHP configurations puts the script-name in the path-info (No need to append it twice)
         if ( isset($_SERVER['PATH_INFO']) ) {
@@ -418 +422 @@
     if ( is_array($current_plugins) ) {
         foreach ($current_plugins as $plugin) {
-            if ('' != $plugin && file_exists(WP_PLUGIN_DIR . '/' . $plugin))
+            if ( '' != $plugin && 0 == validate_file($plugin) && file_exists(WP_PLUGIN_DIR . '/' . $plugin) )
                 include_once(WP_PLUGIN_DIR . '/' . $plugin);
         }