Wordpress 3.0.1

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

diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php
index 0004673c6baaf28f57aec0309c364f67afa90b7e..58c826f903e6414209e60bbff1ff6163b0376e4c 100644 (file)
--- a/wp-includes/formatting.php
+++ b/wp-includes/formatting.php
@@ -2825,8 +2825,20 @@ function sanitize_text_field($str) {
  *
  * @since 3.0.0
  */
  *
  * @since 3.0.0
  */

+

 function capital_P_dangit( $text ) {
 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 );
+

 }
 
 ?>
 }
 
 ?>