diff --git a/wp-includes/kses.php b/wp-includes/kses.php index 886dcfbf9d..e0b0d9ee0b 100644 --- a/wp-includes/kses.php +++ b/wp-includes/kses.php @@ -14,12 +14,15 @@ $allowedtags = array('b' => array(), 'i' => array(), 'strong' => array(), 'code' => array(), + 'acronym' => array('title'), + 'abbr' => array('title'), 'em' => array(), 'strike' => array(), - 'a' => array('href' => array('minlen' => 3, 'maxlen' => 50), - 'title' => array('valueless' => 'n'), + 'a' => array('href' => array('minlen' => 6, 'maxlen' => 250), + 'title', 'rel' => array('minlen' => 3, 'maxlen' => 250)), 'blockquote' => array('cite' => array()), + 'del' => array('datetime'), 'br' => array()); function wp_kses($string, $allowed_html, $allowed_protocols = diff --git a/wp-includes/template-functions.php b/wp-includes/template-functions.php index 14c6b1c5e5..30d0b8dc70 100644 --- a/wp-includes/template-functions.php +++ b/wp-includes/template-functions.php @@ -550,9 +550,10 @@ function the_date_xml() { } function the_date($d='', $before='', $after='', $echo = true) { - global $id, $post, $day, $previousday, $dateformat, $newday; + global $id, $post, $dateday, $previousday, $dateformat, $newday; $the_date = ''; - if ($day != $previousday) { + $dateday = mysql2date('Yd', $post->post_date); + if ($dateday != $previousday) { $the_date .= $before; if ($d=='') { $the_date .= mysql2date($dateformat, $post->post_date); @@ -560,7 +561,7 @@ function the_date($d='', $before='', $after='', $echo = true) { $the_date .= mysql2date($d, $post->post_date); } $the_date .= $after; - $previousday = $day; + $previousday = $dateday; } $the_date = apply_filters('the_date', $the_date); if ($echo) { @@ -1687,10 +1688,10 @@ function comment_text() { $comment_text = convert_chars($comment_text); $comment_text = convert_bbcode($comment_text); $comment_text = convert_gmcode($comment_text); - $comment_text = convert_smilies($comment_text); $comment_text = make_clickable($comment_text); $comment_text = balanceTags($comment_text,1); $comment_text = apply_filters('comment_text', $comment_text); + $comment_text = convert_smilies($comment_text); echo $comment_text; }