Ticket #22263: post.php.diff

wp-includes/post.php

@@ -2850 +2850 @@
                 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";
+                                if ( function_exists('mb_strcut') ) {
+                                        $alt_post_name = mb_strcut(urldecode($slug), 0, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix";
+                                } else {
+                                        $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 ) );
                                 $suffix++;
                         } while ( $post_name_check );
@@ -2865 +2869 @@
                 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";
+                                if ( function_exists('mb_strcut') ) {
+                                        $alt_post_name = mb_strcut( urldecode($slug), 0, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix";
+                                } else {
+                                        $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, $post_parent ) );
                                 $suffix++;
                         } while ( $post_name_check );
@@ -2879 +2887 @@
                 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";
+                                if ( function_exists('mb_strcut') ) {
+                                        $alt_post_name = mb_strcut( urldecode($slug), 0, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix";
+                                } else {
+                                        $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_type, $post_ID ) );
                                 $suffix++;
                         } while ( $post_name_check );