WordPress.org

Make WordPress Core


Ignore:
Timestamp:
01/11/2010 09:49:40 PM (12 years ago)
Author:
wpmuguru
Message:

merge in multisite login, wp-includes, See #11644

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/post.php

    r12682 r12697  
    30773077            if ( 0 === strpos($file, $uploads['basedir']) ) //Check that the upload base exists in the file location
    30783078                $url = str_replace($uploads['basedir'], $uploads['baseurl'], $file); //replace file location with url location
    3079             elseif ( false !== strpos($file, 'wp-content/uploads') )
    3080                 $url = $uploads['baseurl'] . substr( $file, strpos($file, 'wp-content/uploads') + 18 );
    3081             else
    3082                 $url = $uploads['baseurl'] . "/$file"; //Its a newly uploaded file, therefor $file is relative to the basedir.
     3079            elseif ( !is_multisite() ) {
     3080                                if ( false !== strpos($file, 'wp-content/uploads') )
     3081                                        $url = $uploads['baseurl'] . substr( $file, strpos($file, 'wp-content/uploads') + 18 );
     3082                                else
     3083                                        $url = $uploads['baseurl'] . "/$file"; //Its a newly uploaded file, therefor $file is relative to the basedir.
     3084                        }
    30833085        }
    30843086    }
Note: See TracChangeset for help on using the changeset viewer.