[wp-cvs] wordpress/wp-includes functions-formatting.php, 1.35,
1.36 functions.php, 1.123, 1.124 links.php, 1.13,
1.14 template-functions-author.php, 1.9,
1.10 template-functions-category.php, 1.35,
1.36 template-functions-comment.php, 1.25,
1.26 template-functions-general.php, 1.34,
1.35 template-functions-links.php, 1.20, 1.21 version.php,
1.16, 1.17
Ryan Boren
rboren at users.sourceforge.net
Fri Jun 18 00:22:12 UTC 2004
- Previous message: [wp-cvs] wordpress/wp-admin admin-functions.php, 1.31,
1.32 link-categories.php, 1.11, 1.12 link-manager.php, 1.28,
1.29 menu.php, 1.18, 1.19 options.php, 1.26, 1.27 profile.php,
1.25, 1.26 upgrade-functions.php, 1.61, 1.62 users.php, 1.29, 1.30
- Next message: [wp-cvs] wordpress/wp-admin link-categories.php, 1.12,
1.13 link-manager.php, 1.29, 1.30
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/cafelog/wordpress/wp-includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19297/wp-includes
Modified Files:
functions-formatting.php functions.php links.php
template-functions-author.php template-functions-category.php
template-functions-comment.php template-functions-general.php
template-functions-links.php version.php
Log Message:
stripslashes() elimination. Remove extra slashes during upgrade. Bugs 0000059 and 0000018
Index: functions.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/functions.php,v
retrieving revision 1.123
retrieving revision 1.124
diff -C2 -d -r1.123 -r1.124
*** functions.php 15 Jun 2004 03:30:00 -0000 1.123
--- functions.php 18 Jun 2004 00:22:09 -0000 1.124
***************
*** 167,180 ****
global $wpdb, $cache_userdata;
if ( empty($cache_userdata[$userid]) ) {
! $user = $wpdb->get_row("SELECT * FROM $wpdb->users WHERE ID = '$userid'");
! $user->user_nickname = stripslashes($user->user_nickname);
! $user->user_firstname = stripslashes($user->user_firstname);
! $user->user_lastname = stripslashes($user->user_lastname);
! $user->user_description = stripslashes($user->user_description);
! $cache_userdata[$userid] = $user;
! } else {
! $user = $cache_userdata[$userid];
! }
! return $user;
}
--- 167,175 ----
global $wpdb, $cache_userdata;
if ( empty($cache_userdata[$userid]) ) {
! $cache_userdata[$userid] =
! $wpdb->get_row("SELECT * FROM $wpdb->users WHERE ID = '$userid'");
! }
!
! return $cache_userdata[$userid];
}
***************
*** 316,320 ****
if ('home' == $option->option_name) $option->option_value = preg_replace('|/+$|', '', $option->option_value);
if ('category_base' == $option->option_name) $option->option_value = preg_replace('|/+$|', '', $option->option_value);
! $all_options->{$option->option_name} = stripslashes($option->option_value);
}
}
--- 311,315 ----
if ('home' == $option->option_name) $option->option_value = preg_replace('|/+$|', '', $option->option_value);
if ('category_base' == $option->option_name) $option->option_value = preg_replace('|/+$|', '', $option->option_value);
! $all_options->{$option->option_name} = $option->option_value;
}
}
***************
*** 324,328 ****
function update_option($option_name, $newvalue) {
global $wpdb, $cache_settings;
! $newvalue = stripslashes($newvalue);
$newvalue = trim($newvalue); // I can't think of any situation we wouldn't want to trim
$newvalue = $wpdb->escape($newvalue);
--- 319,323 ----
function update_option($option_name, $newvalue) {
global $wpdb, $cache_settings;
! $newvalue = $newvalue;
$newvalue = trim($newvalue); // I can't think of any situation we wouldn't want to trim
$newvalue = $wpdb->escape($newvalue);
***************
*** 517,523 ****
function trackback($trackback_url, $title, $excerpt, $ID) {
global $wpdb;
! $title = urlencode(stripslashes($title));
! $excerpt = urlencode(stripslashes($excerpt));
! $blog_name = urlencode(stripslashes(get_settings('blogname')));
$tb_url = $trackback_url;
$url = urlencode(get_permalink($ID));
--- 512,518 ----
function trackback($trackback_url, $title, $excerpt, $ID) {
global $wpdb;
! $title = urlencode($title);
! $excerpt = urlencode($excerpt);
! $blog_name = urlencode(get_settings('blogname'));
$tb_url = $trackback_url;
$url = urlencode(get_permalink($ID));
***************
*** 933,961 ****
$comment_author_domain = gethostbyaddr($comment->comment_author_IP);
! $blogname = stripslashes(get_settings('blogname'));
if ('comment' == $comment_type) {
! $notify_message = "New comment on your post #$comment->comment_post_ID \"".stripslashes($post->post_title)."\"\r\n\r\n";
$notify_message .= "Author : $comment->comment_author (IP: $comment->comment_author_IP , $comment_author_domain)\r\n";
$notify_message .= "E-mail : $comment->comment_author_email\r\n";
$notify_message .= "URI : $comment->comment_author_url\r\n";
$notify_message .= "Whois : http://ws.arin.net/cgi-bin/whois.pl?queryinput=$comment->comment_author_IP\r\n";
! $notify_message .= "Comment:\r\n".stripslashes($comment->comment_content)."\r\n\r\n";
$notify_message .= "You can see all comments on this post here: \r\n";
! $subject = '[' . $blogname . '] Comment: "' .stripslashes($post->post_title).'"';
} elseif ('trackback' == $comment_type) {
! $notify_message = "New trackback on your post #$comment_post_ID \"".stripslashes($post->post_title)."\"\r\n\r\n";
$notify_message .= "Website: $comment->comment_author (IP: $comment->comment_author_IP , $comment_author_domain)\r\n";
$notify_message .= "URI : $comment->comment_author_url\r\n";
! $notify_message .= "Excerpt: \n".stripslashes($comment->comment_content)."\r\n\r\n";
$notify_message .= "You can see all trackbacks on this post here: \r\n";
! $subject = '[' . $blogname . '] Trackback: "' .stripslashes($post->post_title).'"';
} elseif ('pingback' == $comment_type) {
! $notify_message = "New pingback on your post #$comment_post_ID \"".stripslashes($post->post_title)."\"\r\n\r\n";
$notify_message .= "Website: $comment->comment_author\r\n";
$notify_message .= "URI : $comment->comment_author_url\r\n";
$notify_message .= "Excerpt: \n[...] $original_context [...]\r\n\r\n";
$notify_message .= "You can see all pingbacks on this post here: \r\n";
! $subject = '[' . $blogname . '] Pingback: "' .stripslashes($post->post_title).'"';
}
$notify_message .= get_permalink($comment->comment_post_ID) . '#comments';
--- 928,956 ----
$comment_author_domain = gethostbyaddr($comment->comment_author_IP);
! $blogname = get_settings('blogname');
if ('comment' == $comment_type) {
! $notify_message = "New comment on your post #$comment->comment_post_ID \"".$post->post_title."\"\r\n\r\n";
$notify_message .= "Author : $comment->comment_author (IP: $comment->comment_author_IP , $comment_author_domain)\r\n";
$notify_message .= "E-mail : $comment->comment_author_email\r\n";
$notify_message .= "URI : $comment->comment_author_url\r\n";
$notify_message .= "Whois : http://ws.arin.net/cgi-bin/whois.pl?queryinput=$comment->comment_author_IP\r\n";
! $notify_message .= "Comment:\r\n".$comment->comment_content."\r\n\r\n";
$notify_message .= "You can see all comments on this post here: \r\n";
! $subject = '[' . $blogname . '] Comment: "' .$post->post_title.'"';
} elseif ('trackback' == $comment_type) {
! $notify_message = "New trackback on your post #$comment_post_ID \"".$post->post_title."\"\r\n\r\n";
$notify_message .= "Website: $comment->comment_author (IP: $comment->comment_author_IP , $comment_author_domain)\r\n";
$notify_message .= "URI : $comment->comment_author_url\r\n";
! $notify_message .= "Excerpt: \n".$comment->comment_content."\r\n\r\n";
$notify_message .= "You can see all trackbacks on this post here: \r\n";
! $subject = '[' . $blogname . '] Trackback: "' .$post->post_title.'"';
} elseif ('pingback' == $comment_type) {
! $notify_message = "New pingback on your post #$comment_post_ID \"".$post->post_title."\"\r\n\r\n";
$notify_message .= "Website: $comment->comment_author\r\n";
$notify_message .= "URI : $comment->comment_author_url\r\n";
$notify_message .= "Excerpt: \n[...] $original_context [...]\r\n\r\n";
$notify_message .= "You can see all pingbacks on this post here: \r\n";
! $subject = '[' . $blogname . '] Pingback: "' .$post->post_title.'"';
}
$notify_message .= get_permalink($comment->comment_post_ID) . '#comments';
***************
*** 964,968 ****
$from = "From: \"$blogname\" <wordpress@" . $_SERVER['SERVER_NAME'] . '>';
} else {
! $from = 'From: "' . stripslashes($comment->comment_author) . "\" <$comment->comment_author_email>";
}
--- 959,963 ----
$from = "From: \"$blogname\" <wordpress@" . $_SERVER['SERVER_NAME'] . '>';
} else {
! $from = 'From: "' . $comment->comment_author . "\" <$comment->comment_author_email>";
}
***************
*** 992,1001 ****
$comments_waiting = $wpdb->get_var("SELECT count(comment_ID) FROM $wpdb->comments WHERE comment_approved = '0'");
! $notify_message = "A new comment on the post #$comment->comment_post_ID \"".stripslashes($post->post_title)."\" is waiting for your approval\r\n\r\n";
$notify_message .= "Author : $comment->comment_author (IP: $comment->comment_author_IP , $comment_author_domain)\r\n";
$notify_message .= "E-mail : $comment->comment_author_email\r\n";
$notify_message .= "URL : $comment->comment_author_url\r\n";
$notify_message .= "Whois : http://ws.arin.net/cgi-bin/whois.pl?queryinput=$comment->comment_author_IP\r\n";
! $notify_message .= "Comment:\r\n".stripslashes($comment->comment_content)."\r\n\r\n";
$notify_message .= "To approve this comment, visit: " . get_settings('siteurl') . "/wp-admin/post.php?action=mailapprovecomment&p=".$comment->comment_post_ID."&comment=$comment_id\r\n";
$notify_message .= "To delete this comment, visit: " . get_settings('siteurl') . "/wp-admin/post.php?action=confirmdeletecomment&p=".$comment->comment_post_ID."&comment=$comment_id\r\n";
--- 987,996 ----
$comments_waiting = $wpdb->get_var("SELECT count(comment_ID) FROM $wpdb->comments WHERE comment_approved = '0'");
! $notify_message = "A new comment on the post #$comment->comment_post_ID \"".$post->post_title."\" is waiting for your approval\r\n\r\n";
$notify_message .= "Author : $comment->comment_author (IP: $comment->comment_author_IP , $comment_author_domain)\r\n";
$notify_message .= "E-mail : $comment->comment_author_email\r\n";
$notify_message .= "URL : $comment->comment_author_url\r\n";
$notify_message .= "Whois : http://ws.arin.net/cgi-bin/whois.pl?queryinput=$comment->comment_author_IP\r\n";
! $notify_message .= "Comment:\r\n".$comment->comment_content."\r\n\r\n";
$notify_message .= "To approve this comment, visit: " . get_settings('siteurl') . "/wp-admin/post.php?action=mailapprovecomment&p=".$comment->comment_post_ID."&comment=$comment_id\r\n";
$notify_message .= "To delete this comment, visit: " . get_settings('siteurl') . "/wp-admin/post.php?action=confirmdeletecomment&p=".$comment->comment_post_ID."&comment=$comment_id\r\n";
***************
*** 1003,1007 ****
$notify_message .= get_settings('siteurl') . "/wp-admin/moderation.php\r\n";
! $subject = '[' . stripslashes(get_settings('blogname')) . '] Please approve: "' .stripslashes($post->post_title).'"';
$admin_email = get_settings("admin_email");
$from = "From: $admin_email";
--- 998,1002 ----
$notify_message .= get_settings('siteurl') . "/wp-admin/moderation.php\r\n";
! $subject = '[' . get_settings('blogname') . '] Please approve: "' .$post->post_title.'"';
$admin_email = get_settings("admin_email");
$from = "From: $admin_email";
Index: template-functions-author.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/template-functions-author.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** template-functions-author.php 24 May 2004 08:22:18 -0000 1.9
--- template-functions-author.php 18 Jun 2004 00:22:09 -0000 1.10
***************
*** 73,77 ****
global $id, $authordata;
! echo '<a href="' . get_author_link(0, $authordata->ID, $authordata->user_nicename) . '" title="' . sprintf(__("Posts by %s"), htmlspecialchars(the_author($idmode, false))) . '">' . stripslashes(the_author($idmode, false)) . '</a>';
}
--- 73,77 ----
global $id, $authordata;
! echo '<a href="' . get_author_link(0, $authordata->ID, $authordata->user_nicename) . '" title="' . sprintf(__("Posts by %s"), htmlspecialchars(the_author($idmode, false))) . '">' . the_author($idmode, false) . '</a>';
}
***************
*** 144,148 ****
if (! $hide_empty) echo $name;
} else {
! $link = '<a href="' . get_author_link(0, $author->ID, $author->user_nicename) . '" title="' . sprintf(__("Posts by %s"), htmlspecialchars($author->user_nickname)) . '">' . stripslashes($name) . '</a>';
if ( (! empty($feed_image)) || (! empty($feed)) ) {
--- 144,148 ----
if (! $hide_empty) echo $name;
} else {
! $link = '<a href="' . get_author_link(0, $author->ID, $author->user_nicename) . '" title="' . sprintf(__("Posts by %s"), htmlspecialchars($author->user_nickname)) . '">' . $name . '</a>';
if ( (! empty($feed_image)) || (! empty($feed)) ) {
***************
*** 157,163 ****
if (! empty($feed)) {
! $title = ' title="' . stripslashes($feed) . '"';
! $alt = ' alt="' . stripslashes($feed) . '"';
! $name = stripslashes($feed);
$link .= $title;
}
--- 157,163 ----
if (! empty($feed)) {
! $title = ' title="' . $feed . '"';
! $alt = ' alt="' . $feed . '"';
! $name = $feed;
$link .= $title;
}
Index: functions-formatting.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/functions-formatting.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** functions-formatting.php 11 Jun 2004 17:52:41 -0000 1.35
--- functions-formatting.php 18 Jun 2004 00:22:09 -0000 1.36
***************
*** 51,55 ****
function clean_pre($text) {
- $text = stripslashes($text);
$text = str_replace('<br />', '', $text);
return $text;
--- 51,54 ----
Index: version.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/version.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** version.php 26 May 2004 05:07:14 -0000 1.16
--- version.php 18 Jun 2004 00:22:09 -0000 1.17
***************
*** 3,7 ****
// This just holds the version number, in a separate file so we can bump it without cluttering the CVS
! $wp_version = '1.3-pre-alpha';
! ?>
\ No newline at end of file
--- 3,7 ----
// This just holds the version number, in a separate file so we can bump it without cluttering the CVS
! $wp_version = '1.3-alpha';
! ?>
Index: template-functions-links.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/template-functions-links.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** template-functions-links.php 8 Jun 2004 17:48:21 -0000 1.20
--- template-functions-links.php 18 Jun 2004 00:22:09 -0000 1.21
***************
*** 256,260 ****
$string = '<a href="'.get_permalink($lastpost->ID).'">'.$previous;
if ($title == 'yes') {
! $string .= wptexturize(stripslashes($lastpost->post_title));
}
$string .= '</a>';
--- 256,260 ----
$string = '<a href="'.get_permalink($lastpost->ID).'">'.$previous;
if ($title == 'yes') {
! $string .= wptexturize($lastpost->post_title);
}
$string .= '</a>';
***************
*** 294,298 ****
$string = '<a href="'.get_permalink($nextpost->ID).'">'.$next;
if ($title=='yes') {
! $string .= wptexturize(stripslashes($nextpost->post_title));
}
$string .= '</a>';
--- 294,298 ----
$string = '<a href="'.get_permalink($nextpost->ID).'">'.$next;
if ($title=='yes') {
! $string .= wptexturize($nextpost->post_title);
}
$string .= '</a>';
Index: template-functions-comment.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/template-functions-comment.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** template-functions-comment.php 11 Jun 2004 08:02:40 -0000 1.25
--- template-functions-comment.php 18 Jun 2004 00:22:09 -0000 1.26
***************
*** 161,165 ****
$email = apply_filters('comment_email', $comment->comment_author_email);
if ((!empty($email)) && ($email != '@')) {
! $display = ($linktext != '') ? $linktext : stripslashes($email);
echo $before;
echo "<a href='mailto:$email'>$display</a>";
--- 161,165 ----
$email = apply_filters('comment_email', $comment->comment_author_email);
if ((!empty($email)) && ($email != '@')) {
! $display = ($linktext != '') ? $linktext : $email;
echo $before;
echo "<a href='mailto:$email'>$display</a>";
***************
*** 173,177 ****
if ((!empty($url)) && ($url != 'http://') && ($url != 'http://url')) {
! $display = ($linktext != '') ? $linktext : stripslashes($url);
echo "$before<a href='$url' rel='external'>$display</a>$after";
}
--- 173,177 ----
if ((!empty($url)) && ($url != 'http://') && ($url != 'http://url')) {
! $display = ($linktext != '') ? $linktext : $url;
echo "$before<a href='$url' rel='external'>$display</a>$after";
}
Index: links.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/links.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** links.php 24 May 2004 08:22:18 -0000 1.13
--- links.php 18 Jun 2004 00:22:09 -0000 1.14
***************
*** 177,188 ****
$the_link = '#';
if (($row->link_url != null) && ($row->link_url != '')) {
! $the_link = htmlspecialchars(stripslashes($row->link_url));
}
! $rel = stripslashes($row->link_rel);
if ($rel != '') {
$rel = " rel='$rel'";
}
! $desc = htmlspecialchars(stripslashes($row->link_description), ENT_QUOTES);
! $name = htmlspecialchars(stripslashes($row->link_name), ENT_QUOTES);
$title = $desc;
--- 177,188 ----
$the_link = '#';
if (($row->link_url != null) && ($row->link_url != '')) {
! $the_link = htmlspecialchars($row->link_url);
}
! $rel = $row->link_rel;
if ($rel != '') {
$rel = " rel='$rel'";
}
! $desc = htmlspecialchars($row->link_description, ENT_QUOTES);
! $name = htmlspecialchars($row->link_name, ENT_QUOTES);
$title = $desc;
***************
*** 274,278 ****
** $links = get_linkobjectsbyname('fred');
** foreach ($links as $link) {
! ** echo '<li>'.stripslashes($link->link_name).'</li>';
** }
**/
--- 274,278 ----
** $links = get_linkobjectsbyname('fred');
** foreach ($links as $link) {
! ** echo '<li>'.$link->link_name.'</li>';
** }
**/
***************
*** 351,358 ****
if ($results) {
foreach ($results as $result) {
! $result->link_url = stripslashes($result->link_url);
! $result->link_name = stripslashes($result->link_name);
! $result->link_description = stripslashes($result->link_description);
! $result->link_notes = stripslashes($result->link_notes);
$newresults[] = $result;
}
--- 351,358 ----
if ($results) {
foreach ($results as $result) {
! $result->link_url = $result->link_url;
! $result->link_name = $result->link_name;
! $result->link_description = $result->link_description;
! $result->link_notes = $result->link_notes;
$newresults[] = $result;
}
***************
*** 465,469 ****
$cat_name = $wpdb->get_var("SELECT cat_name FROM $wpdb->linkcategories WHERE cat_id=$id");
}
! return stripslashes($cat_name);
}
--- 465,469 ----
$cat_name = $wpdb->get_var("SELECT cat_name FROM $wpdb->linkcategories WHERE cat_id=$id");
}
! return $cat_name;
}
***************
*** 560,564 ****
// Display the category name
! echo ' <li id="'.sanitize_title($cat['cat_name']).'">' . stripslashes($cat['cat_name']) . "\n\t<ul>\n";
// Call get_links() with all the appropriate params
get_links($cat['link_category'],
--- 560,564 ----
// Display the category name
! echo ' <li id="'.sanitize_title($cat['cat_name']).'">' . $cat['cat_name'] . "\n\t<ul>\n";
// Call get_links() with all the appropriate params
get_links($cat['link_category'],
Index: template-functions-general.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/template-functions-general.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** template-functions-general.php 16 Jun 2004 15:45:44 -0000 1.34
--- template-functions-general.php 18 Jun 2004 00:22:09 -0000 1.35
***************
*** 73,81 ****
if(!empty($cat)) {
if (!stristr($cat,'-')) { // category excluded
! $title = stripslashes(get_the_category_by_ID($cat));
}
}
if (!empty($category_name)) {
! $title = stripslashes($wpdb->get_var("SELECT cat_name FROM $wpdb->categories WHERE category_nicename = '$category_name'"));
}
--- 73,81 ----
if(!empty($cat)) {
if (!stristr($cat,'-')) { // category excluded
! $title = get_the_category_by_ID($cat);
}
}
if (!empty($category_name)) {
! $title = $wpdb->get_var("SELECT cat_name FROM $wpdb->categories WHERE category_nicename = '$category_name'");
}
***************
*** 99,103 ****
// If there's a post
if ($single) {
! $title = strip_tags(stripslashes($posts[0]->post_title));
$title = apply_filters('single_post_title', $title);
}
--- 99,103 ----
// If there's a post
if ($single) {
! $title = strip_tags($posts[0]->post_title);
$title = apply_filters('single_post_title', $title);
}
***************
*** 121,127 ****
$title = apply_filters('single_post_title', $title);
if ($display) {
! echo $prefix.strip_tags(stripslashes($title));
} else {
! return strip_tags(stripslashes($title));
}
}
--- 121,127 ----
$title = apply_filters('single_post_title', $title);
if ($display) {
! echo $prefix.strip_tags($title);
} else {
! return strip_tags($title);
}
}
***************
*** 134,140 ****
if(!empty($my_cat_name)) {
if ($display)
! echo $prefix.strip_tags(stripslashes($my_cat_name));
else
! return strip_tags(stripslashes($my_cat_name));
}
}
--- 134,140 ----
if(!empty($my_cat_name)) {
if ($display)
! echo $prefix.strip_tags($my_cat_name);
else
! return strip_tags($my_cat_name);
}
}
***************
*** 268,272 ****
if ($arcresult->post_date != '0000-00-00 00:00:00') {
$url = get_permalink($arcresult->ID);
! $arc_title = stripslashes($arcresult->post_title);
if ($arc_title) {
$text = strip_tags($arc_title);
--- 268,272 ----
if ($arcresult->post_date != '0000-00-00 00:00:00') {
$url = get_permalink($arcresult->ID);
! $arc_title = $arcresult->post_title;
if ($arc_title) {
$text = strip_tags($arc_title);
***************
*** 420,426 ****
}
if (empty($ak_titles_for_day["$ak_post_title->dom"])) { // first one
! $ak_titles_for_day["$ak_post_title->dom"] = str_replace('"', '"', wptexturize(stripslashes($ak_post_title->post_title)));
} else {
! $ak_titles_for_day["$ak_post_title->dom"] .= $ak_title_separator . str_replace('"', '"', wptexturize(stripslashes($ak_post_title->post_title)));
}
}
--- 420,426 ----
}
if (empty($ak_titles_for_day["$ak_post_title->dom"])) { // first one
! $ak_titles_for_day["$ak_post_title->dom"] = str_replace('"', '"', wptexturize($ak_post_title->post_title));
} else {
! $ak_titles_for_day["$ak_post_title->dom"] .= $ak_title_separator . str_replace('"', '"', wptexturize($ak_post_title->post_title));
}
}
Index: template-functions-category.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/template-functions-category.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** template-functions-category.php 15 Jun 2004 23:24:36 -0000 1.35
--- template-functions-category.php 18 Jun 2004 00:22:09 -0000 1.36
***************
*** 69,73 ****
$thelist .= '<ul class="post-categories">';
foreach ($categories as $category) {
! $category->cat_name = stripslashes($category->cat_name);
$thelist .= "\n\t<li>";
switch(strtolower($parents)) {
--- 69,73 ----
$thelist .= '<ul class="post-categories">';
foreach ($categories as $category) {
! $category->cat_name = $category->cat_name;
$thelist .= "\n\t<li>";
switch(strtolower($parents)) {
***************
*** 94,98 ****
$i = 0;
foreach ($categories as $category) {
! $category->cat_name = stripslashes($category->cat_name);
if (0 < $i) $thelist .= $seperator . ' ';
switch(strtolower($parents)) {
--- 94,98 ----
$i = 0;
foreach ($categories as $category) {
! $category->cat_name = $category->cat_name;
if (0 < $i) $thelist .= $seperator . ' ';
switch(strtolower($parents)) {
***************
*** 118,122 ****
$the_list = '';
foreach ($categories as $category) {
! $category->cat_name = stripslashes(convert_chars($category->cat_name));
if ('rdf' == $type) {
$the_list .= "\n\t<dc:subject>$category->cat_name</dc:subject>";
--- 118,122 ----
$the_list = '';
foreach ($categories as $category) {
! $category->cat_name = convert_chars($category->cat_name);
if ('rdf' == $type) {
$the_list .= "\n\t<dc:subject>$category->cat_name</dc:subject>";
***************
*** 136,140 ****
$cat_name = $cache_categories[$cat_ID]->cat_name;
}
! return(stripslashes($cat_name));
}
--- 136,140 ----
$cat_name = $cache_categories[$cat_ID]->cat_name;
}
! return($cat_name);
}
***************
*** 243,247 ****
echo ' selected="selected"';
echo '>';
! echo stripslashes($cat_name);
if (intval($optioncount) == 1) echo ' ('.$category->cat_count.')';
if (intval($optiondates) == 1) echo ' '.$category->lastday.'/'.$category->lastmonth;
--- 243,247 ----
echo ' selected="selected"';
echo '>';
! echo $cat_name;
if (intval($optioncount) == 1) echo ' ('.$category->cat_count.')';
if (intval($optiondates) == 1) echo ' '.$category->lastday.'/'.$category->lastmonth;
***************
*** 360,364 ****
}
$link .= '>';
! $link .= apply_filters('list_cats', stripslashes($category->cat_name)).'</a>';
if ( (! empty($feed_image)) || (! empty($feed)) ) {
--- 360,364 ----
}
$link .= '>';
! $link .= apply_filters('list_cats', $category->cat_name).'</a>';
if ( (! empty($feed_image)) || (! empty($feed)) ) {
***************
*** 373,379 ****
if ( !empty($feed) ) {
! $title = ' title="' . stripslashes($feed) . '"';
! $alt = ' alt="' . stripslashes($feed) . '"';
! $name = stripslashes($feed);
$link .= $title;
}
--- 373,379 ----
if ( !empty($feed) ) {
! $title = ' title="' . $feed . '"';
! $alt = ' alt="' . $feed . '"';
! $name = $feed;
$link .= $title;
}
- Previous message: [wp-cvs] wordpress/wp-admin admin-functions.php, 1.31,
1.32 link-categories.php, 1.11, 1.12 link-manager.php, 1.28,
1.29 menu.php, 1.18, 1.19 options.php, 1.26, 1.27 profile.php,
1.25, 1.26 upgrade-functions.php, 1.61, 1.62 users.php, 1.29, 1.30
- Next message: [wp-cvs] wordpress/wp-admin link-categories.php, 1.12,
1.13 link-manager.php, 1.29, 1.30
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the cvs
mailing list