Changes in trunk/wp-admin/includes/misc.php [15263:17328]

File:

• trunk/wp-admin/includes/misc.php (modified) (15 diffs)

trunk/wp-admin/includes/misc.php

@@ -10 +10 @@
  * {@internal Missing Short Description}}
  *
- * @since unknown
+ * @since 2.0.0
  *
  * @return unknown
@@ -22 +22 @@
  * {@internal Missing Short Description}}
  *
- * @since unknown
+ * @since 1.5.0
  *
  * @param unknown_type $filename
@@ -58 +58 @@
  * data. Creates file if none exists.
  *
- * @since unknown
+ * @since 1.5.0
  *
  * @param unknown_type $filename
@@ -118 +118 @@
  * blank out old rules.
  *
- * @since unknown
+ * @since 1.5.0
  */
 function save_mod_rewrite_rules() {
@@ -150 +150 @@
  */
 function iis7_save_url_rewrite_rules(){
+    if ( is_multisite() )
+        return;
+
     global $wp_rewrite;
 
@@ -156 +159 @@
 
     // 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(false, '', '');
-            if ( ! empty($rule) ) {
-                return iis7_add_rewrite_rule($web_config_file, $rule);
-            } else {
-                return iis7_delete_rewrite_rule($web_config_file);
-            }
+    if ( iis7_supports_permalinks() && ( ( ! file_exists($web_config_file) && win_is_writable($home_path) && $wp_rewrite->using_mod_rewrite_permalinks() ) || win_is_writable($web_config_file) ) ) {
+        $rule = $wp_rewrite->iis7_url_rewrite_rules(false, '', '');
+        if ( ! empty($rule) ) {
+            return iis7_add_rewrite_rule($web_config_file, $rule);
+        } else {
+            return iis7_delete_rewrite_rule($web_config_file);
         }
     }
@@ -172 +173 @@
  * {@internal Missing Short Description}}
  *
- * @since unknown
+ * @since 1.5.0
  *
  * @param unknown_type $file
@@ -194 +195 @@
  * If siteurl or home changed, flush rewrite rules.
  *
- * @since unknown
+ * @since 2.1.0
  *
  * @param unknown_type $old_value
@@ -213 +214 @@
 
 /**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param unknown_type $url
- * @return unknown
+ * Shorten an URL, to be used as link text
+ *
+ * @since 1.2.1
+ *
+ * @param string $url
+ * @return string
  */
 function url_shorten( $url ) {
@@ -237 +238 @@
  * if neither is defined.
  *
- * @since unknown
+ * @since 2.0.0
  *
  * @param array $vars An array of globals to reset.
@@ -260 +261 @@
  * {@internal Missing Short Description}}
  *
- * @since unknown
+ * @since 2.1.0
  *
  * @param unknown_type $message
@@ -344 +345 @@
         switch ( $map_option ) {
             case 'edit_per_page':
-            case 'ms_sites_per_page':
-            case 'ms_users_per_page':
+            case 'users_per_page':
             case 'edit_comments_per_page':
             case 'upload_per_page':
             case 'edit_tags_per_page':
             case 'plugins_per_page':
+            // Network admin
+            case 'sites_network_per_page':
+            case 'users_network_per_page':
+            case 'site_users_network_per_page':
+            case 'plugins_network_per_page':
+            case 'themes_network_per_page':
+            case 'site_themes_network_per_page':
                 $value = (int) $value;
                 if ( $value < 1 || $value > 999 )
@@ -373 +380 @@
         exit;
     }
-}
-
-/**
- * Check if IIS 7 supports pretty permalinks
- *
- * @since 2.8.0
- *
- * @return bool
- */
-function iis7_supports_permalinks() {
-    global $is_iis7;
-
-    $supports_permalinks = false;
-    if ( $is_iis7 ) {
-        /* First we check if the DOMDocument class exists. If it does not exist,
-         * which is the case for PHP 4.X, then we cannot easily update the xml configuration file,
-         * hence we just bail out and tell user that pretty permalinks cannot be used.
-         * This is not a big issue because PHP 4.X is going to be depricated and for IIS it
-         * is recommended to use PHP 5.X NTS.
-         * Next we check if the URL Rewrite Module 1.1 is loaded and enabled for the web site. When
-         * URL Rewrite 1.1 is loaded it always sets a server variable called 'IIS_UrlRewriteModule'.
-         * Lastly we make sure that PHP is running via FastCGI. This is important because if it runs
-         * via ISAPI then pretty permalinks will not work.
-         */
-        $supports_permalinks = class_exists('DOMDocument') && isset($_SERVER['IIS_UrlRewriteModule']) && ( php_sapi_name() == 'cgi-fcgi' );
-    }
-
-    return apply_filters('iis7_supports_permalinks', $supports_permalinks);
 }
 
@@ -562 +541 @@
  * @since 2.8.0
  *
- * @param object $path
+ * @param string $path
  * @return bool
  */
-function win_is_writable($path) {
+function win_is_writable( $path ) {
     /* will work in despite of Windows ACLs bug
      * NOTE: use a trailing slash for folders!!!
@@ -572 +551 @@
      */
 
-    if ( $path{strlen($path)-1} == '/' ) // recursively return a temporary file path
-        return win_is_writable($path . uniqid(mt_rand()) . '.tmp');
-    else if ( is_dir($path) )
-        return win_is_writable($path . '/' . uniqid(mt_rand()) . '.tmp');
-    // check tmp file for read/write capabilities
-    $rm = file_exists($path);
-    $f = @fopen($path, 'a');
-    if ($f===false)
-        return false;
-    fclose($f);
-    if ( ! $rm )
-        unlink($path);
-    return true;
+    if ( $path[strlen( $path ) - 1] == '/' ) // recursively return a temporary file path
+        return win_is_writable( $path . uniqid( mt_rand() ) . '.tmp');
+    else if ( is_dir( $path ) )
+        return win_is_writable( $path . '/' . uniqid( mt_rand() ) . '.tmp' );
+    // check tmp file for read/write capabilities
+    $should_delete_tmp_file = !file_exists( $path );
+    $f = @fopen( $path, 'a' );
+    if ( $f === false )
+        return false;
+    fclose( $f );
+    if ( $should_delete_tmp_file )
+        unlink( $path );
+    return true;
 }