From 1bd5edacb6ba3bba71806e8281d624656997f360 Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Wed, 23 Jul 2014 16:06:37 +0200
Subject: [PATCH] [ticket/12857] Add header/footer distinction for subsilver2
 events

PHPBB3-12857
---
 phpBB/docs/events.md                                 | 9 ++++-----
 phpBB/styles/subsilver2/template/breadcrumbs.html    | 4 ++--
 phpBB/styles/subsilver2/template/overall_header.html | 2 ++
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
index afd3d27c9a..2c84ceea3f 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -405,18 +405,17 @@ overall_footer_breadcrumb_append
 ===
 * Locations:
     + styles/prosilver/template/navbar_footer.html
+    + styles/subsilver2/template/breadcrumbs.html
 * Since: 3.1.0-a1
-* Purpose: Add links to the list of breadcrumbs in the footer. Note that utilizing this event requires
-a different solution for subsilver2, since it only supports the overall_header_breadcrumb versions.
+* Purpose: Add links to the list of breadcrumbs in the footer
 
 overall_footer_breadcrumb_prepend
 ===
 * Locations:
     + styles/prosilver/template/navbar_footer.html
+    + styles/subsilver2/template/breadcrumbs.html
 * Since: 3.1.0-RC3
-* Purpose: Add links to the list of breadcrumbs in the footer (after site-home, but before board-index).
-Note that utilizing this event requires a different solution for subsilver2, since it only supports the 
-overall_header_breadcrumb versions.
+* Purpose: Add links to the list of breadcrumbs in the footer (after site-home, but before board-index)
 
 overall_footer_content_after
 ===
diff --git a/phpBB/styles/subsilver2/template/breadcrumbs.html b/phpBB/styles/subsilver2/template/breadcrumbs.html
index fb44c6de63..25387da832 100644
--- a/phpBB/styles/subsilver2/template/breadcrumbs.html
+++ b/phpBB/styles/subsilver2/template/breadcrumbs.html
@@ -3,8 +3,8 @@
 	<tr>
 		<td class="row1">
 			<!-- EVENT overall_header_breadcrumbs_before -->
-			<p class="breadcrumbs"><!-- IF U_SITE_HOME --><a href="{U_SITE_HOME}"{$MICRODATA} data-navbar-reference="home">{L_SITE_HOME}</a> <strong>&#187;</strong> <!-- ENDIF --><!-- EVENT overall_header_breadcrumb_prepend --><a href="{U_INDEX}"{$MICRODATA} data-navbar-reference="index">{L_INDEX}</a><!-- BEGIN navlinks --><!-- EVENT overall_header_navlink_prepend --> &#187; <a href="{navlinks.U_VIEW_FORUM}"{$MICRODATA}<!-- IF navlinks.MICRODATA --> {navlinks.MICRODATA}<!-- ENDIF -->>{navlinks.FORUM_NAME}</a><!-- EVENT overall_header_navlink_append --><!-- END navlinks -->
-			<!-- EVENT overall_header_breadcrumb_append --></p>
+			<p class="breadcrumbs"><!-- IF U_SITE_HOME --><a href="{U_SITE_HOME}"{$MICRODATA} data-navbar-reference="home">{L_SITE_HOME}</a> <strong>&#187;</strong> <!-- ENDIF --><!-- IF $OVERALL_HEADER_BREADCRUMBS --><!-- EVENT overall_header_breadcrumb_prepend --><!-- ELSE --><!-- EVENT overall_footer_breadcrumb_prepend --><!-- ENDIF --><a href="{U_INDEX}"{$MICRODATA} data-navbar-reference="index">{L_INDEX}</a><!-- BEGIN navlinks --><!-- EVENT overall_header_navlink_prepend --> &#187; <a href="{navlinks.U_VIEW_FORUM}"{$MICRODATA}<!-- IF navlinks.MICRODATA --> {navlinks.MICRODATA}<!-- ENDIF -->>{navlinks.FORUM_NAME}</a><!-- EVENT overall_header_navlink_append --><!-- END navlinks -->
+			<!-- IF $OVERALL_HEADER_BREADCRUMBS --><!-- EVENT overall_header_breadcrumb_append --><!-- ELSE --><!-- EVENT overall_footer_breadcrumb_append --><!-- ENDIF --></p>
 			<!-- EVENT overall_header_breadcrumbs_after -->
 			<!-- EVENT overall_footer_timezone_before -->
 			<p class="datetime">{S_TIMEZONE}</p>
diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html
index 711ce66362..cb9a3a2a36 100644
--- a/phpBB/styles/subsilver2/template/overall_header.html
+++ b/phpBB/styles/subsilver2/template/overall_header.html
@@ -251,7 +251,9 @@ function marklist(id, name, state)
 	<br style="clear: both;" />
 
 	<!-- DEFINE $S_MICRODATA = 1 -->
+	<!-- DEFINE $OVERALL_HEADER_BREADCRUMBS = 1 -->
 	<!-- INCLUDE breadcrumbs.html -->
+	<!-- UNDEFINE $OVERALL_HEADER_BREADCRUMBS -->
 	<!-- DEFINE $S_MICRODATA = 0 -->
 
 	<br />