Changeset 15378

Timestamp:

07/08/2010 07:43:04 PM (14 years ago)

Author:

markjaquith

Message:

More judicious Wordpress-to-WordPress correction, to avoid bungling reasonable URLs. fixes #13971 for 3.0

Location:

branches/3.0/wp-includes

Files:

• default-filters.php (modified) (1 diff)
• formatting.php (modified) (1 diff)

branches/3.0/wp-includes/default-filters.php

@@ -89 +89 @@
 // 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

branches/3.0/wp-includes/formatting.php

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