Wordpress 3.0.4

[autoinstalls/wordpress.git] / wp-includes / formatting.php

diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php
index 0004673c6baaf28f57aec0309c364f67afa90b7e..3d203e6fc2d71144cbc336eb181a0637b1fb129e 100644 (file)
--- a/wp-includes/formatting.php
+++ b/wp-includes/formatting.php
@@ -2236,7 +2236,8 @@ function esc_url( $url, $protocols = null, $_context = 'display' ) {
 
        // Replace ampersands and single quotes only when displaying.
        if ( 'display' == $_context ) {
-               $url = preg_replace('/&([^#])(?![a-z]{2,8};)/', '&$1', $url);
+               $url = wp_kses_normalize_entities( $url );
+               $url = str_replace( '&', '&', $url );
                $url = str_replace( "'", ''', $url );
        }
 
@@ -2825,8 +2826,20 @@ function sanitize_text_field($str) {
  *
  * @since 3.0.0
  */
+
 function capital_P_dangit( $text ) {
-       return str_replace( 'Wordpress', 'WordPress', $text );
+       // Simple replacement for titles
+       if ( 'the_title' === current_filter() )
+               return str_replace( 'Wordpress', 'WordPress', $text );
+       // Still here? Use the more judicious replacement
+       static $dblq = false;
+       if ( false === $dblq )
+               $dblq = _x('“', 'opening curly quote');
+       return str_replace(
+               array( ' Wordpress', '‘Wordpress', $dblq . 'Wordpress', '>Wordpress', '(Wordpress' ),
+               array( ' WordPress', '‘WordPress', $dblq . 'WordPress', '>WordPress', '(WordPress' ),
+       $text );
+
 }
 
 ?>