From a7a85856402272b465cde097b725653082db1884 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Sat, 23 Jul 2016 13:08:44 +0000 Subject: [PATCH] Posts, Post Types: Remove a redundant `function_exists( 'mb_strlen' )` check in `get_sample_permalink_html()`. `mb_strlen()` is always available since [32114]. See #30633. Built from https://develop.svn.wordpress.org/trunk@38147 git-svn-id: http://core.svn.wordpress.org/trunk@38088 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/post.php | 14 +++----------- wp-includes/version.php | 2 +- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/wp-admin/includes/post.php b/wp-admin/includes/post.php index 86ba666f38..790b736cdf 100644 --- a/wp-admin/includes/post.php +++ b/wp-admin/includes/post.php @@ -1329,18 +1329,10 @@ function get_sample_permalink_html( $id, $new_title = null, $new_slug = null ) { $return .= '' . __('Change Permalinks') . "\n"; } } else { - if ( function_exists( 'mb_strlen' ) ) { - if ( mb_strlen( $post_name ) > 34 ) { - $post_name_abridged = mb_substr( $post_name, 0, 16 ) . '…' . mb_substr( $post_name, -16 ); - } else { - $post_name_abridged = $post_name; - } + if ( mb_strlen( $post_name ) > 34 ) { + $post_name_abridged = mb_substr( $post_name, 0, 16 ) . '…' . mb_substr( $post_name, -16 ); } else { - if ( strlen( $post_name ) > 34 ) { - $post_name_abridged = substr( $post_name, 0, 16 ) . '…' . substr( $post_name, -16 ); - } else { - $post_name_abridged = $post_name; - } + $post_name_abridged = $post_name; } $post_name_html = '' . esc_html( $post_name_abridged ) . ''; diff --git a/wp-includes/version.php b/wp-includes/version.php index 8a0569745c..6b4bf47c80 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.6-beta4-38146'; +$wp_version = '4.6-beta4-38147'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.