Ticket #13971: 13971-more-judicious.002.diff

wp-includes/default-filters.php

@@ -88 +88 @@
 
 // Format WordPress
 foreach ( array( 'the_content', 'the_title', 'comment_text' ) as $filter )
-        add_filter( $filter, 'capital_P_dangit' );
+        add_filter( $filter, 'capital_P_dangit', 11 );
 
 // Format titles
 foreach ( array( 'single_post_title', 'single_cat_title', 'single_tag_title', 'single_month_title', 'nav_menu_attr_title', 'nav_menu_description' ) as $filter ) {

wp-includes/formatting.php

@@ -2825 +2825 @@
  *
  * @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 );
+
 }
 
 ?>