From f9e7fb306c92befd950a53c447ec637f2b1eb413 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Thu, 10 Sep 2015 10:59:27 +0000 Subject: [PATCH] Merge two similar strings. Props dipesh.kakadiya. Fixes #33777. Built from https://develop.svn.wordpress.org/trunk@33998 git-svn-id: http://core.svn.wordpress.org/trunk@33967 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/nav-menu.php | 2 +- wp-includes/class-wp-editor.php | 2 +- wp-includes/media-template.php | 2 +- wp-includes/version.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/wp-admin/includes/nav-menu.php b/wp-admin/includes/nav-menu.php index 9538bcb56d..eac78d6a08 100644 --- a/wp-admin/includes/nav-menu.php +++ b/wp-admin/includes/nav-menu.php @@ -162,7 +162,7 @@ class Walker_Nav_Menu_Edit extends Walker_Nav_Menu {

diff --git a/wp-includes/class-wp-editor.php b/wp-includes/class-wp-editor.php index 8dc1a3bf26..28b2e32644 100644 --- a/wp-includes/class-wp-editor.php +++ b/wp-includes/class-wp-editor.php @@ -1409,7 +1409,7 @@ final class _WP_Editors {

diff --git a/wp-includes/media-template.php b/wp-includes/media-template.php index b85e743aa5..d633e15949 100644 --- a/wp-includes/media-template.php +++ b/wp-includes/media-template.php @@ -1005,7 +1005,7 @@ function wp_print_media_templates() {