diff options
| -rw-r--r-- | wp-admin/import/wp-cat2tag.php | 4 | ||||
| -rw-r--r-- | wp-app.php | 10 | ||||
| -rw-r--r-- | wp-includes/category-template.php | 1 | ||||
| -rw-r--r-- | wp-includes/functions.php | 5 |
4 files changed, 15 insertions, 5 deletions
diff --git a/wp-admin/import/wp-cat2tag.php b/wp-admin/import/wp-cat2tag.php index 885936e..ff6da0d 100644 --- a/wp-admin/import/wp-cat2tag.php +++ b/wp-admin/import/wp-cat2tag.php @@ -14,8 +14,8 @@ class WP_Categories_to_Tags { echo '<p>' . __('Cheatin’ uh?') . '</p>'; echo '</div>'; } else { ?> - <div class="tablenav"><p style="margin:4px"><a style="display:inline;" class="button-secondary" href="admin.php?import=wp-cat2tag">Categories to Tags</a> - <a style="display:inline;" class="button-secondary" href="admin.php?import=wp-cat2tag&step=3">Tags to Categories</a></p></div> + <div class="tablenav"><p style="margin:4px"><a style="display:inline;" class="button-secondary" href="admin.php?import=wp-cat2tag"><?php _e( "Categories to Tags" ); ?></a> + <a style="display:inline;" class="button-secondary" href="admin.php?import=wp-cat2tag&step=3"><?php _e( "Tags to Categories" ); ?></a></p></div> <?php } } @@ -197,7 +197,7 @@ class AtomServer { // check to see if AtomPub is enabled if( !get_option( 'enable_app' ) ) - $this->not_allowed( sprintf( __( 'AtomPub services are disabled on this blog. An admin user can enable them at %s' ), admin_url('options-writing.php') ) ); + $this->forbidden( sprintf( __( 'AtomPub services are disabled on this blog. An admin user can enable them at %s' ), admin_url('options-writing.php') ) ); // dispatch foreach($this->selectors as $regex => $funcs) { @@ -939,6 +939,14 @@ list($content_type, $content) = prep_atom_text_construct(get_the_content()); ?> exit; } + function forbidden($reason='') { + log_app('Status','403: Forbidden'); + header('Content-Type: text/plain'); + status_header('403'); + echo $reason; + exit; + } + function not_found() { log_app('Status','404: Not Found'); header('Content-Type: text/plain'); 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 ); } |