diff options
author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-01-24 12:40:34 +0000 |
---|---|---|
committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-01-24 12:40:34 +0000 |
commit | 9384882739906e813f1a05491fd73e47e8105dee (patch) | |
tree | a14f52d7e2cb2fcce1ab890932c18358d4c4c973 /wp-includes | |
parent | 30d41198c601e5514acad67eb5fbb2e9f6854571 (diff) | |
download | wordpress-mu-9384882739906e813f1a05491fd73e47e8105dee.tar.gz wordpress-mu-9384882739906e813f1a05491fd73e47e8105dee.tar.xz wordpress-mu-9384882739906e813f1a05491fd73e47e8105dee.zip |
WP Merge to revision 4793
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@865 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes')
-rw-r--r-- | wp-includes/category-template.php | 15 | ||||
-rw-r--r-- | wp-includes/deprecated.php | 30 | ||||
-rw-r--r-- | wp-includes/version.php | 2 |
3 files changed, 26 insertions, 21 deletions
diff --git a/wp-includes/category-template.php b/wp-includes/category-template.php index e7eef22..1ca0743 100644 --- a/wp-includes/category-template.php +++ b/wp-includes/category-template.php @@ -88,10 +88,13 @@ function get_the_category_by_ID($cat_ID) { } function get_the_category_list($separator = '', $parents='') { + global $wp_rewrite; $categories = get_the_category(); if (empty($categories)) return apply_filters('the_category', __('Uncategorized'), $separator, $parents); + $rel = ( is_object($wp_rewrite) && $wp_rewrite->using_permalinks() ) ? 'rel="category tag"' : 'rel="category"'; + $thelist = ''; if ( '' == $separator ) { $thelist .= '<ul class="post-categories">'; @@ -101,17 +104,17 @@ function get_the_category_list($separator = '', $parents='') { case 'multiple': if ($category->category_parent) $thelist .= get_category_parents($category->category_parent, TRUE); - $thelist .= '<a href="' . get_category_link($category->cat_ID) . '" title="' . sprintf(__("View all posts in %s"), $category->cat_name) . '" rel="category tag">'.$category->cat_name.'</a></li>'; + $thelist .= '<a href="' . get_category_link($category->cat_ID) . '" title="' . sprintf(__("View all posts in %s"), $category->cat_name) . '" ' . $rel . '>' . $category->cat_name.'</a></li>'; break; case 'single': - $thelist .= '<a href="' . get_category_link($category->cat_ID) . '" title="' . sprintf(__("View all posts in %s"), $category->cat_name) . ' rel="category tag">'; + $thelist .= '<a href="' . get_category_link($category->cat_ID) . '" title="' . sprintf(__("View all posts in %s"), $category->cat_name) . '" ' . $rel . '>'; if ($category->category_parent) $thelist .= get_category_parents($category->category_parent, FALSE); $thelist .= $category->cat_name.'</a></li>'; break; case '': default: - $thelist .= '<a href="' . get_category_link($category->cat_ID) . '" title="' . sprintf(__("View all posts in %s"), $category->cat_name) . '" rel="category tag">'.$category->cat_name.'</a></li>'; + $thelist .= '<a href="' . get_category_link($category->cat_ID) . '" title="' . sprintf(__("View all posts in %s"), $category->cat_name) . '" ' . $rel . '>' . $category->cat_name.'</a></li>'; } } $thelist .= '</ul>'; @@ -124,17 +127,17 @@ function get_the_category_list($separator = '', $parents='') { case 'multiple': if ( $category->category_parent ) $thelist .= get_category_parents($category->category_parent, TRUE); - $thelist .= '<a href="' . get_category_link($category->cat_ID) . '" title="' . sprintf(__("View all posts in %s"), $category->cat_name) . '" rel="category tag">'.$category->cat_name.'</a>'; + $thelist .= '<a href="' . get_category_link($category->cat_ID) . '" title="' . sprintf(__("View all posts in %s"), $category->cat_name) . '" ' . $rel . '>' . $category->cat_name.'</a>'; break; case 'single': - $thelist .= '<a href="' . get_category_link($category->cat_ID) . '" title="' . sprintf(__("View all posts in %s"), $category->cat_name) . '" rel="category tag">'; + $thelist .= '<a href="' . get_category_link($category->cat_ID) . '" title="' . sprintf(__("View all posts in %s"), $category->cat_name) . '" ' . $rel . '>'; if ( $category->category_parent ) $thelist .= get_category_parents($category->category_parent, FALSE); $thelist .= "$category->cat_name</a>"; break; case '': default: - $thelist .= '<a href="' . get_category_link($category->cat_ID) . '" title="' . sprintf(__("View all posts in %s"), $category->cat_name) . '" rel="category tag">'.$category->cat_name.'</a>'; + $thelist .= '<a href="' . get_category_link($category->cat_ID) . '" title="' . sprintf(__("View all posts in %s"), $category->cat_name) . '" ' . $rel . '>' . $category->cat_name.'</a>'; } ++$i; } diff --git a/wp-includes/deprecated.php b/wp-includes/deprecated.php index d0027a5..b72c07f 100644 --- a/wp-includes/deprecated.php +++ b/wp-includes/deprecated.php @@ -1,9 +1,9 @@ <?php
/*
- * Deprecated global variables.
+ * Deprecated global variables.
*/
-
+
$tableposts = $wpdb->posts;
$tableusers = $wpdb->users;
$tablecategories = $wpdb->categories;
@@ -15,10 +15,10 @@ $tableoptions = $wpdb->options; $tablepostmeta = $wpdb->postmeta;
/*
- * Deprecated functios come here to die.
+ * Deprecated functions come here to die.
*/
-// Deprecated. Use get_post().
+// Use get_post().
function get_postdata($postid) {
$post = &get_post($postid);
@@ -43,7 +43,7 @@ function get_postdata($postid) { return $postdata;
}
-// Deprecated. Use the new post loop.
+// Use the new post loop.
function start_wp() {
global $wp_query, $post;
@@ -53,7 +53,6 @@ function start_wp() { setup_postdata($post);
}
-// Deprecated.
function the_category_ID($echo = true) {
// Grab the first cat in the list.
$categories = get_the_category();
@@ -65,7 +64,6 @@ function the_category_ID($echo = true) { return $cat;
}
-// Deprecated.
function the_category_head($before='', $after='') {
global $currentcat, $previouscat;
// Grab the first cat in the list.
@@ -79,7 +77,7 @@ function the_category_head($before='', $after='') { }
}
-// Deprecated. Use previous_post_link().
+// Use previous_post_link().
function previous_post($format='%', $previous='previous post: ', $title='yes', $in_same_cat='no', $limitprev=1, $excluded_categories='') {
if ( empty($in_same_cat) || 'no' == $in_same_cat )
@@ -100,7 +98,7 @@ function previous_post($format='%', $previous='previous post: ', $title='yes', $ echo $format;
}
-// Deprecated. Use next_post_link().
+// Use next_post_link().
function next_post($format='%', $next='next post: ', $title='yes', $in_same_cat='no', $limitnext=1, $excluded_categories='') {
if ( empty($in_same_cat) || 'no' == $in_same_cat )
@@ -122,7 +120,7 @@ function next_post($format='%', $next='next post: ', $title='yes', $in_same_cat= }
//
-// These are deprecated. Use current_user_can().
+// Use current_user_can() for these.
//
/* returns true if $user_id can create a new post */
@@ -244,7 +242,7 @@ function wp_get_linksbyname($category, $args = '') { $args = add_query_arg('category', $cat_id, $args);
wp_get_links($args);
-} // end wp_get_linksbyname
+}
/** function get_linkobjectsbyname()
** Gets an array of link objects associated with category 'cat_name'.
@@ -421,6 +419,7 @@ function get_autotoggle($id = 0) { return 0;
}
+// Use wp_list_cats().
function list_cats($optionall = 1, $all = 'All', $sort_column = 'ID', $sort_order = 'asc', $file = '', $list = true, $optiondates = 0, $optioncount = 0, $hide_empty = 1, $use_desc_for_title = 1, $children=FALSE, $child_of=0, $categories=0, $recurse=0, $feed = '', $feed_image = '', $exclude = '', $hierarchical=FALSE) {
$query = compact('optionall', 'all', 'sort_column', 'sort_order', 'file', 'list', 'optiondates', 'optioncount', 'hide_empty', 'use_desc_for_title', 'children',
'child_of', 'categories', 'recurse', 'feed', 'feed_image', 'exclude', 'hierarchical');
@@ -469,9 +468,9 @@ function dropdown_cats($optionall = 1, $all = 'All', $orderby = 'ID', $order = ' return wp_dropdown_categories($query);
}
-// Deprecated. Use wp_print_scripts() or WP_Scripts instead.
+// Use wp_print_scripts() or WP_Scripts.
function tinymce_include() {
- wp_print_script( 'wp_tiny_mce' );
+ wp_print_script('wp_tiny_mce');
}
function list_authors($optioncount = false, $exclude_admin = true, $show_fullname = false, $hide_empty = true, $feed = '', $feed_image = '') {
@@ -487,12 +486,13 @@ function wp_set_post_cats($blogid = '1', $post_ID = 0, $post_categories = array( return wp_set_post_categories($post_ID, $post_categories);
}
+// Use wp_get_archives().
function get_archives($type='', $limit='', $format='html', $before = '', $after = '', $show_post_count = false) {
$args = compact('type', 'limit', 'format', 'before', 'after', 'show_post_count');
return wp_get_archives($args);
}
-// Deprecated. Use get_author_posts_url().
+// Use get_author_posts_url().
function get_author_link($echo = false, $author_id, $author_nicename = '') {
$link = get_author_posts_url($author_id, $author_nicename);
@@ -501,11 +501,13 @@ function get_author_link($echo = false, $author_id, $author_nicename = '') { return $link;
}
+// Use wp_link_pages().
function link_pages($before='<br />', $after='<br />', $next_or_number='number', $nextpagelink='next page', $previouspagelink='previous page', $pagelink='%', $more_file='') {
$args = compact('before', 'after', 'next_or_number', 'nextpagelink', 'previouspagelink', 'pagelink', 'more_file');
return wp_link_pages($args);
}
+// Use get_option().
function get_settings($option) {
return get_option($option);
}
diff --git a/wp-includes/version.php b/wp-includes/version.php index 4813b0c..f6ba1d5 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -2,7 +2,7 @@ // This holds the version number in a separate file so we can bump it without cluttering the SVN -$wp_version = 'wordpress-mu-1.0'; // Let's just avoid confusion +$wp_version = 'wordpress-mu-1.2'; // Let's just avoid confusion $wp_db_version = 4772; ?> |