Changeset 1356

Timestamp:

07/08/08 11:16:47 (5 months ago)

Author:

donncha

Message:

WP merge to revision 8283

Files:

• trunk/wp-admin/import/wp-cat2tag.php (modified) (1 diff)
• trunk/wp-app.php (modified) (2 diffs)
• trunk/wp-includes/category-template.php (modified) (1 diff)
• trunk/wp-includes/functions.php (modified) (2 diffs)

trunk/wp-admin/import/wp-cat2tag.php

@@ -15 +15 @@
-                        echo '</div>';
-                } else { ?>
-Categories to Tags
-Tags to Categories
+<?php _e( "Categories to Tags" ); ?>
+<?php _e( "Tags to Categories" ); ?>
-<?php   }
-        }

trunk/wp-app.php

@@ -198 +198 @@
-                // check to see if AtomPub is enabled
-                if( !get_option( 'enable_app' ) )
-not_allowed
+forbidden
-
-                // dispatch
@@ -940 +940 @@
-        }
-
+        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');

trunk/wp-includes/category-template.php

@@ -416 +416 @@
-                $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 ) )

trunk/wp-includes/functions.php

@@ -1489 +1489 @@
-        }
-
+        $bdir = $dir; 
+        $burl = $url;
+
-        $subdir = '';
-        if ( get_option( 'uploads_use_yearmonth_folders' ) ) {
@@ -1508 +1511 @@
-        }
-
-
+basedir' => $bdir, 'baseurl' => $burl, '
-        return apply_filters( 'upload_dir', $uploads );
-}