From d71eb860753670689db9f8eca8494ae8cadda8e1 Mon Sep 17 00:00:00 2001
From: Scott Taylor <wonderboymusic@git.wordpress.org>
Date: Tue, 6 Oct 2015 13:45:24 +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.


git-svn-id: https://develop.svn.wordpress.org/trunk@34861 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/includes/menu.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/wp-admin/includes/menu.php b/src/wp-admin/includes/menu.php
index accc04b1b0..da4ba2cf83 100644
--- a/src/wp-admin/includes/menu.php
+++ b/src/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;