WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Silence html_entity_decode warnings. Props Denis-de-Bernardy. fixes #9616 

git-svn-id: http://svn.automattic.com/wordpress/trunk@11081 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2009-04-24 16:57:27 +00:00
parent 0fad23034c
commit 7651b29cb9
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-admin/import/blogger.php
View File

@ -437,7 +437,7 @@ class Blogger_Import {
if ( count( $matches[1] ) ) if ( count( $matches[1] ) )
foreach ( $matches[1] as $match ) foreach ( $matches[1] as $match )
if ( preg_match('/rel=.previous./', $match) ) if ( preg_match('/rel=.previous./', $match) )
$query = html_entity_decode( preg_replace('/^.*href=[\'"].*\?(.+)[\'"].*$/', '$1', $match), ENT_COMPAT, get_option('blog_charset') ); $query = @html_entity_decode( preg_replace('/^.*href=[\'"].*\?(.+)[\'"].*$/', '$1', $match), ENT_COMPAT, get_option('blog_charset') );
if ( $query ) { if ( $query ) {
parse_str($query, $q); parse_str($query, $q);
@ -495,7 +495,7 @@ class Blogger_Import {
if ( count( $matches[1] ) ) if ( count( $matches[1] ) )
foreach ( $matches[1] as $match ) foreach ( $matches[1] as $match )
if ( preg_match('/rel=.previous./', $match) ) if ( preg_match('/rel=.previous./', $match) )
$query = html_entity_decode( preg_replace('/^.*href=[\'"].*\?(.+)[\'"].*$/', '$1', $match), ENT_COMPAT, get_option('blog_charset') ); $query = @html_entity_decode( preg_replace('/^.*href=[\'"].*\?(.+)[\'"].*$/', '$1', $match), ENT_COMPAT, get_option('blog_charset') );
parse_str($query, $q); parse_str($query, $q);
@ -545,7 +545,7 @@ class Blogger_Import {
} }
$post_date = $this->convert_date( $entry->published ); $post_date = $this->convert_date( $entry->published );
$post_content = trim( addslashes( $this->no_apos( html_entity_decode( $entry->content, ENT_COMPAT, get_option('blog_charset') ) ) ) ); $post_content = trim( addslashes( $this->no_apos( @html_entity_decode( $entry->content, ENT_COMPAT, get_option('blog_charset') ) ) ) );
$post_title = trim( addslashes( $this->no_apos( $this->min_whitespace( $entry->title ) ) ) ); $post_title = trim( addslashes( $this->no_apos( $this->min_whitespace( $entry->title ) ) ) );
$post_status = isset( $entry->draft ) ? 'draft' : 'publish'; $post_status = isset( $entry->draft ) ? 'draft' : 'publish';
@ -600,7 +600,7 @@ class Blogger_Import {
$comment_author = addslashes( $this->no_apos( strip_tags( (string) $matches[1] ) ) ); $comment_author = addslashes( $this->no_apos( strip_tags( (string) $matches[1] ) ) );
$comment_author_url = addslashes( $this->no_apos( strip_tags( (string) $matches[2] ) ) ); $comment_author_url = addslashes( $this->no_apos( strip_tags( (string) $matches[2] ) ) );
$comment_date = $this->convert_date( $entry->updated ); $comment_date = $this->convert_date( $entry->updated );
$comment_content = addslashes( $this->no_apos( html_entity_decode( $entry->content, ENT_COMPAT, get_option('blog_charset') ) ) ); $comment_content = addslashes( $this->no_apos( @html_entity_decode( $entry->content, ENT_COMPAT, get_option('blog_charset') ) ) );
// Clean up content // Clean up content
$comment_content = preg_replace_callback('|<(/?[A-Z]+)|', create_function('$match', 'return "<" . strtolower($match[1]);'), $comment_content); $comment_content = preg_replace_callback('|<(/?[A-Z]+)|', create_function('$match', 'return "<" . strtolower($match[1]);'), $comment_content);

2
wp-admin/import/livejournal.php
View File

@ -576,7 +576,7 @@ class LJ_API_Import {
// Get the body and HTMLize it // Get the body and HTMLize it
preg_match( '|<body>(.*)</body>|is', $comment, $matches ); preg_match( '|<body>(.*)</body>|is', $comment, $matches );
$comment_content = !empty( $comment_subject ) ? $comment_subject . "\n\n" . $matches[1] : $matches[1]; $comment_content = !empty( $comment_subject ) ? $comment_subject . "\n\n" . $matches[1] : $matches[1];
$comment_content = html_entity_decode( $comment_content ); $comment_content = @html_entity_decode( $comment_content, ENT_COMPAT, get_option('blog_charset') );
$comment_content = str_replace( '&apos;', "'", $comment_content ); $comment_content = str_replace( '&apos;', "'", $comment_content );
$comment_content = wpautop( $comment_content ); $comment_content = wpautop( $comment_content );
$comment_content = str_replace( '<br>', '<br />', $comment_content ); $comment_content = str_replace( '<br>', '<br />', $comment_content );

2
wp-admin/includes/dashboard.php
View File

@ -800,7 +800,7 @@ function wp_dashboard_plugins_output() {
$title = $item->get_title(); $title = $item->get_title();
$title = wp_specialchars( $title ); $title = wp_specialchars( $title );
$description = wp_specialchars( strip_tags(html_entity_decode($item->get_description(), ENT_QUOTES, get_option('blog_charset'))) ); $description = wp_specialchars( strip_tags(@html_entity_decode($item->get_description(), ENT_QUOTES, get_option('blog_charset'))) );
$ilink = wp_nonce_url('plugin-install.php?tab=plugin-information&plugin=' . $slug, 'install-plugin_' . $slug) . $ilink = wp_nonce_url('plugin-install.php?tab=plugin-information&plugin=' . $slug, 'install-plugin_' . $slug) .
'&amp;TB_iframe=true&amp;width=600&amp;height=800'; '&amp;TB_iframe=true&amp;width=600&amp;height=800';

4
wp-includes/default-widgets.php
View File

@ -711,7 +711,7 @@ function wp_widget_rss($args, $widget_args = 1) {
$desc = ''; $desc = '';
$link = ''; $link = '';
if ( ! is_wp_error($rss) ) { if ( ! is_wp_error($rss) ) {
$desc = attribute_escape(strip_tags(html_entity_decode($rss->get_description(), ENT_QUOTES, get_option('blog_charset')))); $desc = attribute_escape(strip_tags(@html_entity_decode($rss->get_description(), ENT_QUOTES, get_option('blog_charset'))));
if ( empty($title) ) if ( empty($title) )
$title = htmlentities(strip_tags($rss->get_title())); $title = htmlentities(strip_tags($rss->get_title()));
$link = clean_url(strip_tags($rss->get_permalink())); $link = clean_url(strip_tags($rss->get_permalink()));
@ -788,7 +788,7 @@ function wp_widget_rss_output( $rss, $args = array() ) {
if ( empty($title) ) if ( empty($title) )
$title = __('Untitled'); $title = __('Untitled');
$desc = str_replace(array("\n", "\r"), ' ', attribute_escape(strip_tags(html_entity_decode($item->get_description(), ENT_QUOTES, get_option('blog_charset'))))); $desc = str_replace(array("\n", "\r"), ' ', attribute_escape(strip_tags(@html_entity_decode($item->get_description(), ENT_QUOTES, get_option('blog_charset')))));
$desc = wp_html_excerpt( $desc, 360 ) . ' [&hellip;]'; $desc = wp_html_excerpt( $desc, 360 ) . ' [&hellip;]';
$desc = wp_specialchars( $desc ); $desc = wp_specialchars( $desc );

2
wp-includes/feed.php
View File

@ -340,7 +340,7 @@ function get_the_category_rss($type = 'rss') {
elseif ( 'atom' == $type ) elseif ( 'atom' == $type )
$the_list .= sprintf( '<category scheme="%1$s" term="%2$s" />', attribute_escape( apply_filters( 'get_bloginfo_rss', get_bloginfo( 'url' ) ) ), attribute_escape( $cat_name ) ); $the_list .= sprintf( '<category scheme="%1$s" term="%2$s" />', attribute_escape( apply_filters( 'get_bloginfo_rss', get_bloginfo( 'url' ) ) ), attribute_escape( $cat_name ) );
else else
$the_list .= "\t\t<category><![CDATA[" . html_entity_decode( $cat_name, ENT_COMPAT, get_option('blog_charset') ) . "]]></category>\n"; $the_list .= "\t\t<category><![CDATA[" . @html_entity_decode( $cat_name, ENT_COMPAT, get_option('blog_charset') ) . "]]></category>\n";
} }
return apply_filters('the_category_rss', $the_list, $type); return apply_filters('the_category_rss', $the_list, $type);