Changes from trunk/wp-includes/functions.php at r8280 to branches/2.6/wp-includes/functions.php at r8571

File:

• branches/2.6/wp-includes/functions.php (modified) (4 diffs)

branches/2.6/wp-includes/functions.php

@@ -342 +342 @@
                 if ( false === $value ) {
                         if ( defined( 'WP_INSTALLING' ) )
-                                $supress = $wpdb->suppress_errors();
+                                $suppress = $wpdb->suppress_errors();
                         // expected_slashed ($setting)
                         $row = $wpdb->get_row( "SELECT option_value FROM $wpdb->options WHERE option_name = '$setting' LIMIT 1" );
@@ -631 +631 @@
  */
 function maybe_serialize( $data ) {
-        if ( is_string( $data ) )
-                return $data;
-        elseif ( is_array( $data ) || is_object( $data ) )
+        if ( is_array( $data ) || is_object( $data ) )
                 return serialize( $data );
+
         if ( is_serialized( $data ) )
                 return serialize( $data );
+
         return $data;
 }
@@ -1482 +1482 @@
         $siteurl = get_option( 'siteurl' );
         $upload_path = get_option( 'upload_path' );
-        if ( trim($upload_path) === '' )
-                $upload_path = WP_CONTENT_DIR . '/uploads';
-        $dir = $upload_path;
+        $upload_path = trim($upload_path);
+        if ( empty($upload_path) )
+                $dir = WP_CONTENT_DIR . '/uploads';
+        else 
+                $dir = $upload_path;
 
         // $dir is absolute, $path is (maybe) relative to ABSPATH
-        $dir = path_join( ABSPATH, $upload_path );
-
-        if ( !$url = get_option( 'upload_url_path' ) )
-                $url = WP_CONTENT_URL . '/uploads';
+        $dir = path_join( ABSPATH, $dir );
+        
+        if ( !$url = get_option( 'upload_url_path' ) ) {
+                if ( empty($upload_path) or ( $upload_path == $dir ) )
+                        $url = WP_CONTENT_URL . '/uploads';
+                else
+                        $url = trailingslashit( $siteurl ) . $upload_path;
+        }
 
         if ( defined('UPLOADS') ) {
@@ -1518 +1524 @@
                 return array( 'error' => $message );
         }
-
+        
         $uploads = array( 'path' => $dir, 'url' => $url, 'subdir' => $subdir, 'basedir' => $bdir, 'baseurl' => $burl, 'error' => false );
+
         return apply_filters( 'upload_dir', $uploads );
 }