Changeset 36775

Timestamp:

02/29/2016 04:41:03 AM (10 years ago)

Author:

SergeyBiryukov

Message:

Formatting: In sanitize_title_with_dashes(), convert &nbsp, &ndash, and &mdash HTML entities to hyphens on save.

Props polevaultweb for initial patch.
Fixes #31790.

Location:

trunk

Files:

• src/wp-includes/formatting.php (modified) (2 diffs)
• tests/phpunit/tests/formatting/SanitizeTitleWithDashes.php (modified) (1 diff)

trunk/src/wp-includes/formatting.php

@@ -1585 +1585 @@
 
         $title = strtolower($title);
-        $title = preg_replace('/&.+?;/', '', $title); // kill entities
-        $title = str_replace('.', '-', $title);
 
         if ( 'save' == $context ) {
                 // Convert nbsp, ndash and mdash to hyphens
                 $title = str_replace( array( '%c2%a0', '%e2%80%93', '%e2%80%94' ), '-', $title );
+                // Convert nbsp, ndash and mdash HTML entities to hyphens
+                $title = str_replace( array( ' ', ' ', '–', '–', '—', '—' ), '-', $title );
 
                 // Strip these characters entirely
@@ -1612 +1612 @@
                 $title = str_replace( '%c3%97', 'x', $title );
         }
+
+        $title = preg_replace('/&.+?;/', '', $title); // kill entities
+        $title = str_replace('.', '-', $title);
 
         $title = preg_replace('/[^%a-z0-9 _-]/', '', $title);

trunk/tests/phpunit/tests/formatting/SanitizeTitleWithDashes.php

@@ -64 +64 @@
         }
 
+        /**
+         * @ticket 31790
+         */
+        function test_replaces_nbsp_entities() {
+                $this->assertEquals("dont-break-the-space", sanitize_title_with_dashes("don't break the space", '', 'save'));
+        }
+
         function test_replaces_ndash_mdash() {
                 $this->assertEquals("do-the-dash", sanitize_title_with_dashes("Do – the Dash", '', 'save'));
                 $this->assertEquals("do-the-dash", sanitize_title_with_dashes("Do the — Dash", '', 'save'));
+        }
+
+        /**
+         * @ticket 31790
+         */
+        function test_replaces_ndash_mdash_entities() {
+                $this->assertEquals("do-the-dash", sanitize_title_with_dashes("Do – the – Dash", '', 'save'));
+                $this->assertEquals("do-the-dash", sanitize_title_with_dashes("Do — the — Dash", '', 'save'));
         }