← Back to branch summary

~ubuntu-branches/ubuntu/trusty/phpmyadmin/trusty

« back to all changes in this revision

Viewing changes to libraries/navigation/NavigationTree.class.php

  • Committer: Package Import Robot
  • Author(s): Thijs Kinkhorst
  • Date: 2013-10-07 20:18:01 UTC
  • mfrom: (1.2.46)
  • Revision ID: package-import@ubuntu.com-20131007201801-l5l0ril5992p8sxz
Tags: 4:4.0.8-1
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libraries/navigation/NavigationTree.class.php
587
587
                    }
588
588
                    $groups[$key]->pos2 = $node->pos2;
589
589
                    $groups[$key]->pos3 = $node->pos3;
 
590
                    if ($node instanceof Node_Table_Container) {
 
591
                        $tblGroup = '&tbl_group='
 
592
                            . urlencode($key . $node->separator);
 
593
                        $groups[$key]->links = array(
 
594
                            'text' => $node->links['text'] . $tblGroup,
 
595
                            'icon' => $node->links['icon'] . $tblGroup
 
596
                        );
 
597
                    }
590
598
                    $node->addChild($groups[$key]);
591
599
                    foreach ($separators as $separator) {
592
600
                        // FIXME: this could be more efficient
594
602
                            $name_substring = substr(
595
603
                                $child->name, 0, strlen($key) + strlen($separator)
596
604
                            );
597
 
                            if ($name_substring == $key . $separator
 
605
                            if (($name_substring == $key . $separator
 
606
                                || $child->name == $key)
598
607
                                && $child->type == Node::OBJECT
599
608
                            ) {
600
609
                                $class = get_class($child);
881
890
                $retval .= "</div>";
882
891
            }
883
892
 
884
 
            $dblinkclass = ' class="dbLink"';
885
893
            $linkClass = '';
886
894
            $haveAjax = array(
887
895
                'functions',
933
941
                    $retval .= htmlspecialchars($node->name);
934
942
                    $retval .= "</a>";
935
943
                } else {
936
 
                    $retval .= "<a$dblinkclass$linkClass href='$link'>";
 
944
                    $retval .= "<a$linkClass href='$link'>";
937
945
                    $retval .= htmlspecialchars($node->real_name);
938
946
                    $retval .= "</a>";
939
947
                }