Merge pull request theme-next#497 from JiangTJ/fix-same-submenu

fix submenu when path name is same

Author: ivan-nginx

layout/_partials/breadcrumb.swig

@@ -10,12 +10,12 @@
         {% if current == count - 1 %}
           <li>{{ path | upper }}</li>
         {% else %}
-          <li><a href="{{ link }}{{ url_for(path) }}/">{{ path | upper }}</a></li>
           {% if link == '' %}
             {% set link = '/' + path %}
           {% else %}
             {% set link += '/' + path %}
           {% endif %}
+          <li><a href="{{ url_for(link) }}/">{{ path | upper }}</a></li>
         {% endif %}
       {% endif %}
     {% endfor %}

layout/_partials/header/sub-menu.swig

@@ -56,8 +56,8 @@
 
                   {# If current URL is value of parent submenu 'default' path #}
                   {% set paths = page.path.split('/') %}
-                  {% for currentSubParentUrl in paths %}
-                    {% if currentSubParentUrl == subvalue.default.split('||')[0] | trim | replace('/', '', 'g') %}
+                  {% if paths.length > 2 %}
+                    {% if paths[1] == subvalue.default.split('||')[0] | trim | replace('/', '', 'g') %}
 
                       {# Submenu-2 items #}
                       <ul id="sub-menu-2" class="sub-menu menu">
@@ -79,7 +79,7 @@
                       {# End Submenu-2 items #}
 
                     {% endif %}
-                  {% endfor %}
+                  {% endif %}
                   {# End URL & path comparing #}
 
                 {% endif %}