From c5475fbfc2baa50b5f650bde4e262e908419669f Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Tue, 6 Oct 2015 13:46:25 +0000
Subject: [PATCH] Admin Menu: remove duplicated separators, and use `strpos()`
 (instead of `strcmp()`) when determining if the separator CSS class is
 present.

Props rilwis, chriscct7.
Fixes #24104.

Built from https://develop.svn.wordpress.org/trunk@34861


git-svn-id: http://core.svn.wordpress.org/trunk@34826 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/menu.php | 3 +--
 wp-includes/version.php    | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/wp-admin/includes/menu.php b/wp-admin/includes/menu.php
index accc04b1b0..da4ba2cf83 100644
--- a/wp-admin/includes/menu.php
+++ b/wp-admin/includes/menu.php
@@ -181,12 +181,11 @@ unset($id, $data, $subs, $first_sub);
 // Remove any duplicated separators
 $separator_found = false;
 foreach ( $menu as $id => $data ) {
-	if ( 0 == strcmp('wp-menu-separator', $data[4] ) ) {
+	if ( false !== strpos( $data[4], 'wp-menu-separator' ) ) {
 		if ( ! $separator_found ) {
 			$separator_found = true;
 		} else {
 			unset($menu[$id]);
-			$separator_found = false;
 		}
 	} else {
 		$separator_found = false;
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 8426b448f8..02574047a7 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-alpha-34860';
+$wp_version = '4.4-alpha-34861';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.