gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Simplify code for generating separators array"

Browse Source 
This reverts commit e3d93b7f8a.

The new code did not properly handle empty separator.

Signed-off-by: Michal Čihař <michal@cihar.com>
This commit is contained in:
Michal Čihař 2014-05-10 09:19:18 +02:00
parent 6f9435b3ea
commit 07b090bcd2
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/navigation/NavigationTree.class.php
View File

@ -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) {