WordPress.org

Make WordPress Core

Changeset 8369


Ignore:
Timestamp:
07/18/2008 03:19:12 AM (10 years ago)
Author:
ryan
Message:

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

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/press-this.php

    r8332 r8369  
    3535
    3636            foreach( (array) $_REQUEST['photo_src'] as $key => $image) {
    37                 // escape quote for matching
    38                 $quoted = preg_quote2($image);
    39 
     37               
    4038                // see if files exist in content - we don't want to upload non-used selected files.
    41                 if( strpos($_REQUEST['content'], $quoted) !== false ) {
     39                if( strpos($_REQUEST['content'], $image) !== false ) {
    4240                    $upload = media_sideload_image($image, $post_ID, $_REQUEST['photo_description'][$key]);
     41                     
    4342                    // Replace the POSTED content <img> with correct uploaded ones.
     43                    // escape quote for matching
     44                    $quoted = preg_quote2($image);
    4445                    if( !is_wp_error($upload) ) $content = preg_replace('/<img ([^>]*)src=(\"|\')'.$quoted.'(\2)([^>\/]*)\/*>/is', $upload, $content);
    4546                }
  • trunk/wp-includes/functions.php

    r8352 r8369  
    14901490    // $dir is absolute, $path is (maybe) relative to ABSPATH
    14911491    $dir = path_join( ABSPATH, $dir );
    1492 
     1492   
    14931493    if ( !$url = get_option( 'upload_url_path' ) ) {
    1494         if ( empty($upload_path) )
     1494        if ( empty($upload_path) or ( $upload_path == $dir ) )
    14951495            $url = WP_CONTENT_URL . '/uploads';
    14961496        else
     
    15241524        return array( 'error' => $message );
    15251525    }
    1526 
     1526   
    15271527    $uploads = array( 'path' => $dir, 'url' => $url, 'subdir' => $subdir, 'basedir' => $bdir, 'baseurl' => $burl, 'error' => false );
     1528
    15281529    return apply_filters( 'upload_dir', $uploads );
    15291530}
Note: See TracChangeset for help on using the changeset viewer.