diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-07-08 11:16:47 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-07-08 11:16:47 +0000 |
| commit | bb260cb1234422a27c7e7d380f6c047d80bc49ed (patch) | |
| tree | 3c39902763bb62be04b29122b343ab20a7b283ff /wp-includes | |
| parent | 6081c995737157ea06244568c48570148b08258f (diff) | |
| download | wordpress-mu-bb260cb1234422a27c7e7d380f6c047d80bc49ed.tar.gz wordpress-mu-bb260cb1234422a27c7e7d380f6c047d80bc49ed.tar.xz wordpress-mu-bb260cb1234422a27c7e7d380f6c047d80bc49ed.zip | |
WP merge to revision 8283
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1356 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes')
| -rw-r--r-- | wp-includes/category-template.php | 1 | ||||
| -rw-r--r-- | wp-includes/functions.php | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/wp-includes/category-template.php b/wp-includes/category-template.php index 69fc14d..6ff2178 100644 --- a/wp-includes/category-template.php +++ b/wp-includes/category-template.php @@ -415,7 +415,6 @@ function wp_generate_tag_cloud( $tags, $args = '' ) { foreach ( $counts as $tag => $count ) { $tag_id = $tag_ids[$tag]; $tag_link = clean_url($tag_links[$tag]); - $tag = str_replace(' ', ' ', wp_specialchars( $tag )); $a[] = "<a href='$tag_link' class='tag-link-$tag_id' title='" . attribute_escape( sprintf( __ngettext('%d topic','%d topics',$count), $count ) ) . "'$rel style='font-size: " . ( $smallest + ( ( $count - $min_count ) * $font_step ) ) . "$unit;'>$tag</a>"; diff --git a/wp-includes/functions.php b/wp-includes/functions.php index bcec475..332f831 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -1488,6 +1488,9 @@ function wp_upload_dir( $time = NULL ) { $url = trailingslashit( $siteurl ) . UPLOADS; } + $bdir = $dir; + $burl = $url; + $subdir = ''; if ( get_option( 'uploads_use_yearmonth_folders' ) ) { // Generate the yearly and monthly dirs @@ -1507,7 +1510,7 @@ function wp_upload_dir( $time = NULL ) { return array( 'error' => $message ); } - $uploads = array( 'path' => $dir, 'url' => $url, 'subdir' => $subdir, 'error' => false ); + $uploads = array( 'path' => $dir, 'url' => $url, 'subdir' => $subdir, 'basedir' => $bdir, 'baseurl' => $burl, 'error' => false ); return apply_filters( 'upload_dir', $uploads ); } |