WordPress.org
Get WordPress

Make WordPress Core

Changeset 11081


Ignore:
Timestamp:
04/24/2009 04:57:27 PM (17 years ago)
Author:
ryan
Message:

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

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/wp-admin/import/blogger.php

    r10688 r11081  
    438438                    foreach ( $matches[1] as $match )
    439439                        if ( preg_match('/rel=.previous./', $match) )
    440                             $query = html_entity_decode( preg_replace('/^.*href=[\'"].*\?(.+)[\'"].*$/', '$1', $match), ENT_COMPAT, get_option('blog_charset') );
     440                            $query = @html_entity_decode( preg_replace('/^.*href=[\'"].*\?(.+)[\'"].*$/', '$1', $match), ENT_COMPAT, get_option('blog_charset') );
    441441
    442442                if ( $query ) {
    … …  
    496496                    foreach ( $matches[1] as $match )
    497497                        if ( preg_match('/rel=.previous./', $match) )
    498                             $query = html_entity_decode( preg_replace('/^.*href=[\'"].*\?(.+)[\'"].*$/', '$1', $match), ENT_COMPAT, get_option('blog_charset') );
     498                            $query = @html_entity_decode( preg_replace('/^.*href=[\'"].*\?(.+)[\'"].*$/', '$1', $match), ENT_COMPAT, get_option('blog_charset') );
    499499
    500500                parse_str($query, $q);
    … …  
    546546
    547547        $post_date    = $this->convert_date( $entry->published );
    548         $post_content = trim( addslashes( $this->no_apos( html_entity_decode( $entry->content, ENT_COMPAT, get_option('blog_charset') ) ) ) );
     548        $post_content = trim( addslashes( $this->no_apos( @html_entity_decode( $entry->content, ENT_COMPAT, get_option('blog_charset') ) ) ) );
    549549        $post_title   = trim( addslashes( $this->no_apos( $this->min_whitespace( $entry->title ) ) ) );
    550550        $post_status  = isset( $entry->draft ) ? 'draft' : 'publish';
    … …  
    601601        $comment_author_url = addslashes( $this->no_apos( strip_tags( (string) $matches[2] ) ) );
    602602        $comment_date    = $this->convert_date( $entry->updated );
    603         $comment_content = addslashes( $this->no_apos( html_entity_decode( $entry->content, ENT_COMPAT, get_option('blog_charset') ) ) );
     603        $comment_content = addslashes( $this->no_apos( @html_entity_decode( $entry->content, ENT_COMPAT, get_option('blog_charset') ) ) );
    604604
    605605        // Clean up content

  • trunk/wp-admin/import/livejournal.php

    r10880 r11081  
    577577        preg_match( '|<body>(.*)</body>|is', $comment, $matches );
    578578        $comment_content = !empty( $comment_subject ) ? $comment_subject . "\n\n" . $matches[1] : $matches[1];
    579         $comment_content = html_entity_decode( $comment_content );
     579        $comment_content = @html_entity_decode( $comment_content, ENT_COMPAT, get_option('blog_charset') );
    580580        $comment_content = str_replace( '&apos;', "'", $comment_content );
    581581        $comment_content = wpautop( $comment_content );

  • trunk/wp-admin/includes/dashboard.php

    r10901 r11081  
    801801        $title = wp_specialchars( $title );
    802802
    803         $description = wp_specialchars( strip_tags(html_entity_decode($item->get_description(), ENT_QUOTES, get_option('blog_charset'))) );
     803        $description = wp_specialchars( strip_tags(@html_entity_decode($item->get_description(), ENT_QUOTES, get_option('blog_charset'))) );
    804804
    805805        $ilink = wp_nonce_url('plugin-install.php?tab=plugin-information&plugin=' . $slug, 'install-plugin_' . $slug) .

  • trunk/wp-includes/default-widgets.php

    r11018 r11081  
    712712    $link = '';
    713713    if ( ! is_wp_error($rss) ) {
    714         $desc = attribute_escape(strip_tags(html_entity_decode($rss->get_description(), ENT_QUOTES, get_option('blog_charset'))));
     714        $desc = attribute_escape(strip_tags(@html_entity_decode($rss->get_description(), ENT_QUOTES, get_option('blog_charset'))));
    715715        if ( empty($title) )
    716716            $title = htmlentities(strip_tags($rss->get_title()));
    … …  
    789789            $title = __('Untitled');
    790790
    791         $desc = str_replace(array("\n", "\r"), ' ', attribute_escape(strip_tags(html_entity_decode($item->get_description(), ENT_QUOTES, get_option('blog_charset')))));
     791        $desc = str_replace(array("\n", "\r"), ' ', attribute_escape(strip_tags(@html_entity_decode($item->get_description(), ENT_QUOTES, get_option('blog_charset')))));
    792792        $desc = wp_html_excerpt( $desc, 360 ) . ' [&hellip;]';
    793793        $desc = wp_specialchars( $desc );

  • trunk/wp-includes/feed.php

    r10758 r11081  
    341341            $the_list .= sprintf( '<category scheme="%1$s" term="%2$s" />', attribute_escape( apply_filters( 'get_bloginfo_rss', get_bloginfo( 'url' ) ) ), attribute_escape( $cat_name ) );
    342342        else
    343             $the_list .= "\t\t<category><![CDATA[" . html_entity_decode( $cat_name, ENT_COMPAT, get_option('blog_charset') ) . "]]></category>\n";
     343            $the_list .= "\t\t<category><![CDATA[" . @html_entity_decode( $cat_name, ENT_COMPAT, get_option('blog_charset') ) . "]]></category>\n";
    344344    }
    345345
Note: See TracChangeset for help on using the changeset viewer.