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 d020e74add59a42f0c157bbfbdd702f7134ac942..96bcab3e3d9b4f66d058372a32ef71a5b9e212c6 100644 (file)
--- a/wp-admin/includes/misc.php
+++ b/wp-admin/includes/misc.php
@@ -72,7 +72,9 @@ function insert_with_markers( $filename, $marker, $insertion ) {
                        $markerdata = explode( "\n", implode( '', file( $filename ) ) );
                }
 
-               $f = fopen( $filename, 'w' );
+               if ( !$f = @fopen( $filename, 'w' ) )
+                       return false;
+
                $foundit = false;
                if ( $markerdata ) {
                        $state = true;
@@ -152,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() ) {
-                       $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 {
@@ -270,6 +272,9 @@ function wp_doc_link_parse( $content ) {
        if ( !is_string( $content ) || empty( $content ) )
                return array();
 
+       if ( !function_exists('token_get_all') )
+               return array();
+
        $tokens = token_get_all( $content );
        $functions = array();
        $ignore_functions = array();
@@ -582,6 +587,7 @@ function iis7_add_rewrite_rule($filename, $rewrite_rule) {
        $rule_fragment->appendXML($rewrite_rule);
        $rules_node->appendChild($rule_fragment);
 
+       $doc->encoding = "UTF-8";
        $doc->formatOutput = true;
        saveDomDocument($doc, $filename);