Ticket #21013: 21013.10.patch

wp-includes/post.php

@@ -2964 +2964 @@
                 if ( $post_name_check || in_array( $slug, $feeds ) || apply_filters( 'wp_unique_post_slug_is_bad_attachment_slug', false, $slug ) ) {
                         $suffix = 2;
                         do {
-                                $alt_post_name = substr ($slug, 0, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix";
-                                $post_name_check = $wpdb->get_var( $wpdb->prepare($check_sql, $alt_post_name, $post_ID ) );
+                                $alt_post_name = _truncate_post_slug( $slug, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix";
+                                $post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $alt_post_name, $post_ID ) );
                                 $suffix++;
                         } while ( $post_name_check );
                         $slug = $alt_post_name;
@@ -2979 +2979 @@
                 if ( $post_name_check || in_array( $slug, $feeds ) || preg_match( "@^($wp_rewrite->pagination_base)?\d+$@", $slug )  || apply_filters( 'wp_unique_post_slug_is_bad_hierarchical_slug', false, $slug, $post_type, $post_parent ) ) {
                         $suffix = 2;
                         do {
-                                $alt_post_name = substr( $slug, 0, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix";
+                                $alt_post_name = _truncate_post_slug( $slug, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix";
                                 $post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $alt_post_name, $post_ID, $post_parent ) );
                                 $suffix++;
                         } while ( $post_name_check );
@@ -2993 +2993 @@
                 if ( $post_name_check || in_array( $slug, $feeds ) || apply_filters( 'wp_unique_post_slug_is_bad_flat_slug', false, $slug, $post_type ) ) {
                         $suffix = 2;
                         do {
-                                $alt_post_name = substr( $slug, 0, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix";
+                                $alt_post_name = _truncate_post_slug( $slug, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix";
                                 $post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $alt_post_name, $post_type, $post_ID ) );
                                 $suffix++;
                         } while ( $post_name_check );
@@ -3005 +3005 @@
 }
 
 /**
+ * Truncates a post slug with UTF-8 characters.
+ *
+ * @since 3.5.0
+ * @access private
+ *
+ * @param string $slug The slug to truncate.
+ * @param int $length Max length of the slug.
+ * @return string The truncated slug.
+ */
+function _truncate_post_slug( $slug, $length = 200 ) {
+        if ( strlen( $slug ) > $length ) {
+                if ( urldecode( $slug ) === $slug )
+                        $slug = substr( $slug, 0, $length );
+                else
+                        $slug = utf8_uri_encode( urldecode( $slug ), $length );
+        }
+
+        return rtrim( $slug, '-' );
+}
+
+/**
  * Adds tags to a post.
  *
  * @uses wp_set_post_tags() Same first two parameters, but the last parameter is always set to true.