Changeset 12698

Timestamp:

01/11/2010 10:08:49 PM (14 years ago)

Author:

ryan

Message:

Mainstream things that don't need to be multisite only. Formatting cleanups. see #11644

File:

• trunk/wp-includes/functions.php (modified) (13 diffs)

trunk/wp-includes/functions.php

@@ -29 +29 @@
         return false;
 
-    if( 'G' == $dateformatstring ) {
+    if ( 'G' == $dateformatstring ) {
         return strtotime( $m . ' +0000' );
     }
@@ -35 +35 @@
     $i = strtotime( $m );
 
-    if( 'U' == $dateformatstring )
+    if ( 'U' == $dateformatstring )
         return $i;
 
@@ -201 +201 @@
     $weekday = date( 'w', $day ); // The day of the week from the timestamp
     $i = 86400; // One day
-    if( !is_numeric($start_of_week) )
+    if ( !is_numeric($start_of_week) )
         $start_of_week = get_option( 'start_of_week' );
 
@@ -330 +330 @@
     if ( defined( 'WP_INSTALLING' ) && is_multisite() ) {
         $notoptions = array();
-        } else {
-                $notoptions = wp_cache_get( 'notoptions', 'options' );
-                if ( isset( $notoptions[$setting] ) )
-                        return $default;
-        }
+    } else {
+        $notoptions = wp_cache_get( 'notoptions', 'options' );
+        if ( isset( $notoptions[$setting] ) )
+            return $default;
+    }
 
     $alloptions = wp_load_alloptions();
@@ -417 +417 @@
 
     if ( !defined( 'WP_INSTALLING' ) || !is_multisite() )
-            $alloptions = wp_cache_get( 'alloptions', 'options' );
+        $alloptions = wp_cache_get( 'alloptions', 'options' );
 
     if ( !$alloptions ) {
@@ -427 +427 @@
         foreach ( (array) $alloptions_db as $o )
             $alloptions[$o->option_name] = $o->option_value;
-                if ( !defined( 'WP_INSTALLING' ) || !is_multisite() )
-                        wp_cache_add( 'alloptions', $alloptions, 'options' );
+            if ( !defined( 'WP_INSTALLING' ) || !is_multisite() )
+                wp_cache_add( 'alloptions', $alloptions, 'options' );
     }
     return $alloptions;
@@ -630 +630 @@
     global $_wp_using_ext_object_cache, $wpdb;
 
-        if( is_multisite() )
-                do_action( 'delete_transient_' . $transient );
+    do_action( 'delete_transient_' . $transient );
 
     if ( $_wp_using_ext_object_cache ) {
@@ -700 +699 @@
     global $_wp_using_ext_object_cache, $wpdb;
 
-        if( is_multisite() )
-                $value = apply_filters( 'pre_set_transient_' . $transient, $value );
+    $value = apply_filters( 'pre_set_transient_' . $transient, $value );
 
     if ( $_wp_using_ext_object_cache ) {
@@ -1433 +1431 @@
     $wp->main( $query_vars );
 
-    if( !isset($wp_the_query) )
+    if ( !isset($wp_the_query) )
         $wp_the_query = $wp_query;
 }
@@ -2113 +2111 @@
 
     // edge case: if file is named '.ext', treat as an empty name
-    if( $name === $ext )
+    if ( $name === $ext )
         $name = '';
 
@@ -2187 +2185 @@
         return $upload;
 
-        if( is_multisite() ) {
-                /* WPMU check file before writing it */
-                $upload_bits_error = apply_filters( 'wp_upload_bits', array( 'name' => $name, 'bits' => $bits, 'time' => $time ) );
-                if( is_array( $upload_bits_error ) == false ) {
-                        $upload[ 'error' ] = $upload_bits_error;
-                        return $upload;
-                }
-        }
+    $upload_bits_error = apply_filters( 'wp_upload_bits', array( 'name' => $name, 'bits' => $bits, 'time' => $time ) );
+    if ( !is_array( $upload_bits_error ) ) {
+        $upload[ 'error' ] = $upload_bits_error;
+        return $upload;
+    }
 
     $filename = wp_unique_filename( $upload['path'], $name );
@@ -2530 +2525 @@
 
     if ( !function_exists( 'did_action' ) || !did_action( 'admin_head' ) ) :
-    if( !headers_sent() ){
+    if ( !headers_sent() ){
         status_header( $r['response'] );
         nocache_headers();
@@ -3762 +3757 @@
     fclose( $fp );
 
-    if( $context != '' ) {
+    if ( $context != '' ) {
         $extra_headers = apply_filters( "extra_$context".'_headers', array() );