Changeset 8369

Timestamp:

07/18/2008 03:19:12 AM (16 years ago)

Author:

ryan

Message:

Image sideload and wp_upload_dir() fixes from noel. fixes #7342 for trunk

Location:

trunk

Files:

• wp-admin/press-this.php (modified) (1 diff)
• wp-includes/functions.php (modified) (2 diffs)

trunk/wp-admin/press-this.php

@@ -35 +35 @@
 
             foreach( (array) $_REQUEST['photo_src'] as $key => $image) {
-                // escape quote for matching
-                $quoted = preg_quote2($image);
-
+                
                 // see if files exist in content - we don't want to upload non-used selected files.
-                if( strpos($_REQUEST['content'], $quoted) !== false ) {
+                if( strpos($_REQUEST['content'], $image) !== false ) {
                     $upload = media_sideload_image($image, $post_ID, $_REQUEST['photo_description'][$key]);
+                     
                     // Replace the POSTED content <img> with correct uploaded ones.
+                    // escape quote for matching
+                    $quoted = preg_quote2($image);
                     if( !is_wp_error($upload) ) $content = preg_replace('/<img ([^>]*)src=(\"|\')'.$quoted.'(\2)([^>\/]*)\/*>/is', $upload, $content);
                 }

trunk/wp-includes/functions.php

@@ -1490 +1490 @@
     // $dir is absolute, $path is (maybe) relative to ABSPATH
     $dir = path_join( ABSPATH, $dir );
-
+    
     if ( !$url = get_option( 'upload_url_path' ) ) {
-        if ( empty($upload_path) )
+        if ( empty($upload_path) or ( $upload_path == $dir ) )
             $url = WP_CONTENT_URL . '/uploads';
         else
@@ -1524 +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 );
 }