[wp-cvs] wordpress/wp-includes comment-functions.php, 1.24,
1.25 feed-functions.php, 1.2, 1.3 functions-post.php, 1.39,
1.40 functions.php, 1.249, 1.250 template-functions-author.php,
1.19, 1.20 template-functions-category.php, 1.51,
1.52 template-functions-general.php, 1.66,
1.67 template-functions-links.php, 1.53,
1.54 template-functions-post.php, 1.43, 1.44
Ryan Boren
rboren at users.sourceforge.net
Sun Feb 6 03:40:10 GMT 2005
Update of /cvsroot/cafelog/wordpress/wp-includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13606
Modified Files:
comment-functions.php feed-functions.php functions-post.php
functions.php template-functions-author.php
template-functions-category.php template-functions-general.php
template-functions-links.php template-functions-post.php
Log Message:
Correctly add args to strings that contain only a query string and not a full URI.
Index: functions.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/functions.php,v
retrieving revision 1.249
retrieving revision 1.250
diff -C2 -d -r1.249 -r1.250
*** functions.php 5 Feb 2005 18:10:05 -0000 1.249
--- functions.php 6 Feb 2005 03:40:08 -0000 1.250
***************
*** 1670,1674 ****
}
}
! else {
$base = $uri . '?';
$query = '';
--- 1670,1674 ----
}
}
! else if (! ststr($uri, '/')) {
$base = $uri . '?';
$query = '';
Index: template-functions-author.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/template-functions-author.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** template-functions-author.php 26 Jan 2005 22:50:15 -0000 1.19
--- template-functions-author.php 6 Feb 2005 03:40:08 -0000 1.20
***************
*** 137,141 ****
}
! $link = apply_filters('author_link', $link);
if ($echo) echo $link;
return $link;
--- 137,141 ----
}
! $link = apply_filters('author_link', $link, $author_id, $author_nicename);
if ($echo) echo $link;
return $link;
Index: template-functions-post.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/template-functions-post.php,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** template-functions-post.php 2 Feb 2005 22:52:47 -0000 1.43
--- template-functions-post.php 6 Feb 2005 03:40:08 -0000 1.44
***************
*** 32,36 ****
$title = get_the_title();
if (!empty($title)) {
! $title = apply_filters('the_title', $before . $title . $after);
if ($echo)
echo $title;
--- 32,36 ----
$title = get_the_title();
if (!empty($title)) {
! $title = apply_filters('the_title', $before . $title . $after, $before, $after);
if ($echo)
echo $title;
Index: feed-functions.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/feed-functions.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** feed-functions.php 31 Jan 2005 10:06:12 -0000 1.2
--- feed-functions.php 6 Feb 2005 03:40:08 -0000 1.3
***************
*** 132,136 ****
}
}
! echo apply_filters('the_category_rss', $the_list);
}
--- 132,136 ----
}
}
! echo apply_filters('the_category_rss', $the_list, $type);
}
Index: comment-functions.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/comment-functions.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** comment-functions.php 31 Jan 2005 10:16:07 -0000 1.24
--- comment-functions.php 6 Feb 2005 03:40:08 -0000 1.25
***************
*** 599,603 ****
if ($wpdb->query($query)) {
! do_action('wp_set_comment_status', $comment_id);
return true;
} else {
--- 599,603 ----
if ($wpdb->query($query)) {
! do_action('wp_set_comment_status', $comment_id, $comment_status);
return true;
} else {
Index: template-functions-links.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/template-functions-links.php,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** template-functions-links.php 1 Feb 2005 11:14:45 -0000 1.53
--- template-functions-links.php 6 Feb 2005 03:40:08 -0000 1.54
***************
*** 75,82 ****
$idpost->post_name,
);
! return apply_filters('post_link', get_settings('home') . str_replace($rewritecode, $rewritereplace, $permalink));
} else { // if they're not using the fancy permalink option
$permalink = get_settings('home') . '/?p=' . $idpost->ID;
! return apply_filters('post_link', $permalink);
}
}
--- 75,82 ----
$idpost->post_name,
);
! return apply_filters('post_link', get_settings('home') . str_replace($rewritecode, $rewritereplace, $permalink), $idpost);
} else { // if they're not using the fancy permalink option
$permalink = get_settings('home') . '/?p=' . $idpost->ID;
! return apply_filters('post_link', $permalink, $idpost);
}
}
***************
*** 99,103 ****
}
! return apply_filters('page_link', $link);
}
--- 99,103 ----
}
! return apply_filters('page_link', $link, $id);
}
***************
*** 108,114 ****
if (!empty($yearlink)) {
$yearlink = str_replace('%year%', $year, $yearlink);
! return apply_filters('year_link', get_settings('home') . trailingslashit($yearlink));
} else {
! return apply_filters('year_link', get_settings('home') .'/'. $querystring_start.'m'.$querystring_equal.$year);
}
}
--- 108,114 ----
if (!empty($yearlink)) {
$yearlink = str_replace('%year%', $year, $yearlink);
! return apply_filters('year_link', get_settings('home') . trailingslashit($yearlink), $year);
} else {
! return apply_filters('year_link', get_settings('home') .'/'. $querystring_start.'m'.$querystring_equal.$year, $year);
}
}
***************
*** 122,128 ****
$monthlink = str_replace('%year%', $year, $monthlink);
$monthlink = str_replace('%monthnum%', zeroise(intval($month), 2), $monthlink);
! return apply_filters('month_link', get_settings('home') . trailingslashit($monthlink));
} else {
! return apply_filters('month_link', get_settings('home') .'/'. $querystring_start.'m'.$querystring_equal.$year.zeroise($month, 2));
}
}
--- 122,128 ----
$monthlink = str_replace('%year%', $year, $monthlink);
$monthlink = str_replace('%monthnum%', zeroise(intval($month), 2), $monthlink);
! return apply_filters('month_link', get_settings('home') . trailingslashit($monthlink), $year, $month);
} else {
! return apply_filters('month_link', get_settings('home') .'/'. $querystring_start.'m'.$querystring_equal.$year.zeroise($month, 2), $year, $month);
}
}
***************
*** 139,145 ****
$daylink = str_replace('%monthnum%', zeroise(intval($month), 2), $daylink);
$daylink = str_replace('%day%', zeroise(intval($day), 2), $daylink);
! return apply_filters('day_link', get_settings('home') . trailingslashit($daylink));
} else {
! return apply_filters('day_link', get_settings('home') .'/'. $querystring_start.'m'.$querystring_equal.$year.zeroise($month, 2).zeroise($day, 2));
}
}
--- 139,145 ----
$daylink = str_replace('%monthnum%', zeroise(intval($month), 2), $daylink);
$daylink = str_replace('%day%', zeroise(intval($day), 2), $daylink);
! return apply_filters('day_link', get_settings('home') . trailingslashit($daylink), $year, $month, $day);
} else {
! return apply_filters('day_link', get_settings('home') .'/'. $querystring_start.'m'.$querystring_equal.$year.zeroise($month, 2).zeroise($day, 2), $year, $month, $day);
}
}
***************
*** 171,175 ****
}
! return apply_filters('feed_link', $output);
}
--- 171,175 ----
}
! return apply_filters('feed_link', $output, $feed);
}
***************
*** 265,269 ****
}
! $title = apply_filters('the_title', $post->post_title);
$string = '<a href="'.get_permalink($post->ID).'">';
--- 265,269 ----
}
! $title = apply_filters('the_title', $post->post_title, $post);
$string = '<a href="'.get_permalink($post->ID).'">';
***************
*** 285,289 ****
}
! $title = apply_filters('the_title', $post->post_title);
$string = '<a href="'.get_permalink($post->ID).'">';
--- 285,289 ----
}
! $title = apply_filters('the_title', $post->post_title, $post);
$string = '<a href="'.get_permalink($post->ID).'">';
Index: functions-post.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/functions-post.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** functions-post.php 5 Feb 2005 20:45:50 -0000 1.39
--- functions-post.php 6 Feb 2005 03:40:08 -0000 1.40
***************
*** 390,394 ****
global $wpdb;
! do_action('wp_blacklist_check');
if ( preg_match_all('/&#(\d+);/', $comment . $author . $url, $chars) ) {
--- 390,394 ----
global $wpdb;
! do_action('wp_blacklist_check', $author, $email, $url, $comment, $user_ip, $user_agent);
if ( preg_match_all('/&#(\d+);/', $comment . $author . $url, $chars) ) {
***************
*** 462,466 ****
$time_newcomment = mysql2date('U', $now_gmt);
if ( ($time_newcomment - $time_lastcomment) < 15 ) {
! do_action('comment_flood_trigger');
die( __('Sorry, you can only post a new comment once every 15 seconds. Slow down cowboy.') );
}
--- 462,466 ----
$time_newcomment = mysql2date('U', $now_gmt);
if ( ($time_newcomment - $time_lastcomment) < 15 ) {
! do_action('comment_flood_trigger', $time_lastcomment, $time_newcomment);
die( __('Sorry, you can only post a new comment once every 15 seconds. Slow down cowboy.') );
}
***************
*** 483,487 ****
$comment_id = $wpdb->insert_id;
! do_action('comment_post', $comment_id);
if ( 'spam' !== $approved ) { // If it's spam save it silently for later crunching
--- 483,487 ----
$comment_id = $wpdb->insert_id;
! do_action('comment_post', $comment_id, $approved);
if ( 'spam' !== $approved ) { // If it's spam save it silently for later crunching
Index: template-functions-general.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/template-functions-general.php,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -d -r1.66 -r1.67
*** template-functions-general.php 1 Feb 2005 06:20:54 -0000 1.66
--- template-functions-general.php 6 Feb 2005 03:40:08 -0000 1.67
***************
*** 60,64 ****
function bloginfo($show='') {
$info = get_bloginfo($show);
! $info = apply_filters('bloginfo', $info);
echo convert_chars($info);
}
--- 60,64 ----
function bloginfo($show='') {
$info = get_bloginfo($show);
! $info = apply_filters('bloginfo', $info, $show);
echo convert_chars($info);
}
***************
*** 596,600 ****
$previousday = $day;
}
! $the_date = apply_filters('the_date', $the_date);
if ($echo) {
echo $the_date;
--- 596,600 ----
$previousday = $day;
}
! $the_date = apply_filters('the_date', $the_date, $d, $before, $after);
if ($echo) {
echo $the_date;
***************
*** 605,609 ****
function the_time( $d = '' ) {
! echo apply_filters('the_time', get_the_time( $d ) );
}
--- 605,609 ----
function the_time( $d = '' ) {
! echo apply_filters('the_time', get_the_time( $d ), $d);
}
***************
*** 613,617 ****
else
$the_time = get_post_time($d);
! return apply_filters('get_the_time', $the_time);
}
--- 613,617 ----
else
$the_time = get_post_time($d);
! return apply_filters('get_the_time', $the_time, $d);
}
***************
*** 624,628 ****
$time = mysql2date($d, $time);
! return apply_filters('get_the_time', $time);
}
--- 624,628 ----
$time = mysql2date($d, $time);
! return apply_filters('get_the_time', $time, $d, $gmt);
}
***************
*** 643,647 ****
$previousweekday = $day;
}
! $the_weekday_date = apply_filters('the_weekday_date', $the_weekday_date);
echo $the_weekday_date;
}
--- 643,647 ----
$previousweekday = $day;
}
! $the_weekday_date = apply_filters('the_weekday_date', $the_weekday_date, $before, $after);
echo $the_weekday_date;
}
Index: template-functions-category.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/template-functions-category.php,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** template-functions-category.php 31 Jan 2005 03:49:50 -0000 1.51
--- template-functions-category.php 6 Feb 2005 03:40:08 -0000 1.52
***************
*** 40,44 ****
$catlink = get_settings('home') . trailingslashit($catlink);
}
! $catlink = apply_filters('category_link', $catlink);
if ($echo) echo $catlink;
return $catlink;
--- 40,44 ----
$catlink = get_settings('home') . trailingslashit($catlink);
}
! $catlink = apply_filters('category_link', $catlink, $category_id, $category_nicename);
if ($echo) echo $catlink;
return $catlink;
***************
*** 100,104 ****
}
}
! echo apply_filters('the_category', $thelist);
}
--- 100,104 ----
}
}
! echo apply_filters('the_category', $thelist, $separator, $parents);
}
***************
*** 174,178 ****
if (!$category) $category = $cat;
$category_description = $cache_categories[$category]->category_description;
! $category_description = apply_filters('category_description', $category_description);
return $category_description;
}
--- 174,178 ----
if (!$category) $category = $cat;
$category_description = $cache_categories[$category]->category_description;
! $category_description = apply_filters('category_description', $category_description, $category);
return $category_description;
}
***************
*** 213,217 ****
if ($categories) {
foreach ($categories as $category) {
! $cat_name = apply_filters('list_cats', $category->cat_name);
echo "\t<option value=\"".$category->cat_ID."\"";
if ($category->cat_ID == $selected)
--- 213,217 ----
if ($categories) {
foreach ($categories as $category) {
! $cat_name = apply_filters('list_cats', $category->cat_name, $category);
echo "\t<option value=\"".$category->cat_ID."\"";
if ($category->cat_ID == $selected)
***************
*** 329,336 ****
$link .= 'title="'. sprintf(__("View all posts filed under %s"), wp_specialchars($category->cat_name)) . '"';
} else {
! $link .= 'title="' . wp_specialchars(apply_filters('category_description',$category->category_description)) . '"';
}
$link .= '>';
! $link .= apply_filters('list_cats', $category->cat_name).'</a>';
if ( (! empty($feed_image)) || (! empty($feed)) ) {
--- 329,336 ----
$link .= 'title="'. sprintf(__("View all posts filed under %s"), wp_specialchars($category->cat_name)) . '"';
} else {
! $link .= 'title="' . wp_specialchars(apply_filters('category_description',$category->category_description,$category)) . '"';
}
$link .= '>';
! $link .= apply_filters('list_cats', $category->cat_name, $category).'</a>';
if ( (! empty($feed_image)) || (! empty($feed)) ) {
More information about the cvs
mailing list