Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed: merge conflict

This commit is contained in:
Ninos Ego 2014-08-27 01:42:20 +02:00
parent 4c28b920b6 602254851a
commit fbaa044f37
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
templates/global/breadcrumb.php
View File

@ -184,7 +184,11 @@ if ( ( ! is_front_page() && ! ( is_post_type_archive() && get_option( 'page_on_f
while ( $parent_id ) {
$page = get_page( $parent_id );
<<<<<<< HEAD
$breadcrumbs[] = '<a href="' . get_permalink( $page->ID ) . '">' . get_the_title( $page->ID ) . '</a>';
=======
$breadcrumbs[] = $before . '<a href="' . get_permalink( $page->ID ) . '">' . get_the_title( $page->ID ) . '</a>' . $after . $delimiter;
>>>>>>> upstream/master
$parent_id = $page->post_parent;
}