KSES fixes.
git-svn-id: http://svn.automattic.com/wordpress/trunk@663 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
e5718bf66b
commit
3a2f87a2d4
|
@ -14,12 +14,15 @@ $allowedtags = array('b' => array(),
|
||||||
'i' => array(),
|
'i' => array(),
|
||||||
'strong' => array(),
|
'strong' => array(),
|
||||||
'code' => array(),
|
'code' => array(),
|
||||||
|
'acronym' => array('title'),
|
||||||
|
'abbr' => array('title'),
|
||||||
'em' => array(),
|
'em' => array(),
|
||||||
'strike' => array(),
|
'strike' => array(),
|
||||||
'a' => array('href' => array('minlen' => 3, 'maxlen' => 50),
|
'a' => array('href' => array('minlen' => 6, 'maxlen' => 250),
|
||||||
'title' => array('valueless' => 'n'),
|
'title',
|
||||||
'rel' => array('minlen' => 3, 'maxlen' => 250)),
|
'rel' => array('minlen' => 3, 'maxlen' => 250)),
|
||||||
'blockquote' => array('cite' => array()),
|
'blockquote' => array('cite' => array()),
|
||||||
|
'del' => array('datetime'),
|
||||||
'br' => array());
|
'br' => array());
|
||||||
|
|
||||||
function wp_kses($string, $allowed_html, $allowed_protocols =
|
function wp_kses($string, $allowed_html, $allowed_protocols =
|
||||||
|
|
|
@ -550,9 +550,10 @@ function the_date_xml() {
|
||||||
}
|
}
|
||||||
|
|
||||||
function the_date($d='', $before='', $after='', $echo = true) {
|
function the_date($d='', $before='', $after='', $echo = true) {
|
||||||
global $id, $post, $day, $previousday, $dateformat, $newday;
|
global $id, $post, $dateday, $previousday, $dateformat, $newday;
|
||||||
$the_date = '';
|
$the_date = '';
|
||||||
if ($day != $previousday) {
|
$dateday = mysql2date('Yd', $post->post_date);
|
||||||
|
if ($dateday != $previousday) {
|
||||||
$the_date .= $before;
|
$the_date .= $before;
|
||||||
if ($d=='') {
|
if ($d=='') {
|
||||||
$the_date .= mysql2date($dateformat, $post->post_date);
|
$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 .= mysql2date($d, $post->post_date);
|
||||||
}
|
}
|
||||||
$the_date .= $after;
|
$the_date .= $after;
|
||||||
$previousday = $day;
|
$previousday = $dateday;
|
||||||
}
|
}
|
||||||
$the_date = apply_filters('the_date', $the_date);
|
$the_date = apply_filters('the_date', $the_date);
|
||||||
if ($echo) {
|
if ($echo) {
|
||||||
|
@ -1687,10 +1688,10 @@ function comment_text() {
|
||||||
$comment_text = convert_chars($comment_text);
|
$comment_text = convert_chars($comment_text);
|
||||||
$comment_text = convert_bbcode($comment_text);
|
$comment_text = convert_bbcode($comment_text);
|
||||||
$comment_text = convert_gmcode($comment_text);
|
$comment_text = convert_gmcode($comment_text);
|
||||||
$comment_text = convert_smilies($comment_text);
|
|
||||||
$comment_text = make_clickable($comment_text);
|
$comment_text = make_clickable($comment_text);
|
||||||
$comment_text = balanceTags($comment_text,1);
|
$comment_text = balanceTags($comment_text,1);
|
||||||
$comment_text = apply_filters('comment_text', $comment_text);
|
$comment_text = apply_filters('comment_text', $comment_text);
|
||||||
|
$comment_text = convert_smilies($comment_text);
|
||||||
echo $comment_text;
|
echo $comment_text;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue