Wordpress 2.9

[autoinstalls/wordpress.git] / wp-admin / includes / misc.php

diff --git a/wp-admin/includes/misc.php b/wp-admin/includes/misc.php
index 356c6b0018b1a16cd7af2a58fe7026f566840907..96bcab3e3d9b4f66d058372a32ef71a5b9e212c6 100644 (file)
--- a/wp-admin/includes/misc.php
+++ b/wp-admin/includes/misc.php
@@ -154,7 +154,7 @@ function iis7_save_url_rewrite_rules(){
        // Using win_is_writable() instead of is_writable() because of a bug in Windows PHP
        if ( ( ! file_exists($web_config_file) && win_is_writable($home_path) && $wp_rewrite->using_mod_rewrite_permalinks() ) || win_is_writable($web_config_file) ) {
                if ( iis7_supports_permalinks() ) {
        // Using win_is_writable() instead of is_writable() because of a bug in Windows PHP
        if ( ( ! file_exists($web_config_file) && win_is_writable($home_path) && $wp_rewrite->using_mod_rewrite_permalinks() ) || win_is_writable($web_config_file) ) {
                if ( iis7_supports_permalinks() ) {

-                       $rule = $wp_rewrite->iis7_url_rewrite_rules();
+                       $rule = $wp_rewrite->iis7_url_rewrite_rules(false, '', '');

                        if ( ! empty($rule) ) {
                                return iis7_add_rewrite_rule($web_config_file, $rule);
                        } else {
                        if ( ! empty($rule) ) {
                                return iis7_add_rewrite_rule($web_config_file, $rule);
                        } else {


@@ -587,6 +587,7 @@ function iis7_add_rewrite_rule($filename, $rewrite_rule) {
        $rule_fragment->appendXML($rewrite_rule);
        $rules_node->appendChild($rule_fragment);
 
        $rule_fragment->appendXML($rewrite_rule);
        $rules_node->appendChild($rule_fragment);
 

+       $doc->encoding = "UTF-8";

        $doc->formatOutput = true;
        saveDomDocument($doc, $filename);
 
        $doc->formatOutput = true;
        saveDomDocument($doc, $filename);