Merge remote-tracking branch 'refs/remotes/origin/3.0'
authorMarcel Werk <burntime@woltlab.com>
Sat, 5 May 2018 13:27:46 +0000 (15:27 +0200)
committerMarcel Werk <burntime@woltlab.com>
Sat, 5 May 2018 13:27:46 +0000 (15:27 +0200)
# Conflicts:
# com.woltlab.wcf/templates/breadcrumbs.tpl

1  2 
com.woltlab.wcf/templates/breadcrumbs.tpl

index 56b7186141e4a0ee35a611a57b485780abdf5725,36ff44cd85eb2e3f40e02d0427ef235523f22a87..ea1cfe797715ab5a68327a8e1b85603374dc97b8
@@@ -4,12 -4,9 +4,12 @@@
                <ol{if $__microdata} itemprop="breadcrumb" itemscope itemtype="http://schema.org/BreadcrumbList"{/if}>
                        {content}
                                {foreach from=$__wcf->getBreadcrumbs() item=$breadcrumb}
 -                                      <li title="{$breadcrumb->getLabel()}"{if $__microdata} itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"{/if}>
 -                                              <a href="{$breadcrumb->getURL()}"{if $__microdata} itemprop="item"{/if}><span{if $__microdata} itemprop="name"{/if}>{$breadcrumb->getLabel()}</span></a>
 -                                      </li>
 +                                      {* skip breadcrumbs that do not expose a visible label *}
 +                                      {if $breadcrumb->getLabel()}
 +                                              <li title="{$breadcrumb->getLabel()}"{if $__microdata} itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"{/if}>
-                                                       <a href="{$breadcrumb->getURL()}"{if $__microdata} itemprop="url"{/if}><span{if $__microdata} itemprop="name"{/if}>{$breadcrumb->getLabel()}</span></a>
++                                                      <a href="{$breadcrumb->getURL()}"{if $__microdata} itemprop="item"{/if}><span{if $__microdata} itemprop="name"{/if}>{$breadcrumb->getLabel()}</span></a>
 +                                              </li>
 +                                      {/if}
                                {/foreach}
                                
                                {event name='breadcrumbs'}