From 07b090bcd25ea899840020a6e1955ce2c183d61e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Sat, 10 May 2014 09:19:18 +0200
Subject: [PATCH] Revert "Simplify code for generating separators array"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit e3d93b7f8ab8452efd8edd8e5903b2ae774865de.

The new code did not properly handle empty separator.

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 libraries/navigation/NavigationTree.class.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/libraries/navigation/NavigationTree.class.php b/libraries/navigation/NavigationTree.class.php
index 342a7f6232..de9cc45cc1 100644
--- a/libraries/navigation/NavigationTree.class.php
+++ b/libraries/navigation/NavigationTree.class.php
@@ -548,9 +548,11 @@ class PMA_NavigationTree
             return;
         }
 
-        $separators = $node->separator;
-        if (! is_array($separators)) {
-            $separators = array($separators);
+        $separators = array();
+        if (is_array($node->separator)) {
+            $separators = $node->separator;
+        } else if (strlen($node->separator)) {
+            $separators[] = $node->separator;
         }
         $prefixes = array();
         if ($node->separator_depth > 0) {