WordPress.org

Make WordPress Core

Changeset 10688


Ignore:
Timestamp:
03/03/09 18:37:25 (5 years ago)
Author:
ryan
Message:

Pass blog charset to html_entity_decode(). Props adferguson. fixes #7563

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/import/blogger.php

    r10339 r10688  
    438438                    foreach ( $matches[1] as $match ) 
    439439                        if ( preg_match('/rel=.previous./', $match) ) 
    440                             $query = html_entity_decode( preg_replace('/^.*href=[\'"].*\?(.+)[\'"].*$/', '$1', $match) ); 
     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) ); 
     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 ) ) ) ); 
     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 ) ) ); 
     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/includes/dashboard.php

    r10680 r10688  
    748748        $title = wp_specialchars( $title ); 
    749749 
    750         $description = wp_specialchars( strip_tags(html_entity_decode($item->get_description(), ENT_QUOTES)) ); 
     750        $description = wp_specialchars( strip_tags(html_entity_decode($item->get_description(), ENT_QUOTES, get_option('blog_charset'))) ); 
    751751 
    752752        list($link, $frag) = explode( '#', $item->get_link() ); 
  • trunk/wp-includes/feed.php

    r10687 r10688  
    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 .= "\n\t\t<category><![CDATA[" . html_entity_decode( $cat_name ) . "]]></category>\n"; 
     343            $the_list .= "\n\t\t<category><![CDATA[" . html_entity_decode( $cat_name, ENT_COMPAT, get_option('blog_charset') ) . "]]></category>\n"; 
    344344    } 
    345345 
  • trunk/wp-includes/widgets.php

    r10670 r10688  
    15061506    while ( strstr($link, 'http') != $link ) 
    15071507        $link = substr($link, 1); 
    1508     $desc = attribute_escape(strip_tags(html_entity_decode($rss->get_description(), ENT_QUOTES))); 
     1508    $desc = attribute_escape(strip_tags(html_entity_decode($rss->get_description(), ENT_QUOTES, get_option('blog_charset')))); 
    15091509    $title = $options[$number]['title']; 
    15101510    if ( empty($title) ) 
     
    15761576            $title = __('Untitled'); 
    15771577 
    1578         $desc = str_replace(array("\n", "\r"), ' ', attribute_escape(strip_tags(html_entity_decode($item->get_description(), ENT_QUOTES)))); 
     1578        $desc = str_replace(array("\n", "\r"), ' ', attribute_escape(strip_tags(html_entity_decode($item->get_description(), ENT_QUOTES, get_option('blog_charset'))))); 
    15791579        $desc = wp_html_excerpt( $desc, 360 ) . ' [&hellip;]'; 
    15801580        $desc = wp_specialchars( $desc ); 
Note: See TracChangeset for help on using the changeset viewer.