9 files changed, 112 insertions, 37 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
index b6d4bfe214..b80e5fd4cb 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -437,9 +437,18 @@ 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
 
+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)
+
 overall_footer_content_after
 ===
 * Locations:
@@ -520,6 +529,30 @@ overall_header_breadcrumb_append
 * Since: 3.1.0-a1
 * Purpose: Add links to the list of breadcrumbs in the header
 
+overall_header_breadcrumb_prepend
+===
+* Locations:
+    + styles/prosilver/template/navbar_header.html
+    + styles/subsilver2/template/breadcrumbs.html
+* Since: 3.1.0-RC3
+* Purpose: Add links to the list of breadcrumbs in the header (after site-home, but before board-index)
+
+overall_header_breadcrumbs_after
+===
+* Locations:
+    + styles/prosilver/template/navbar_header.html
+    + styles/subsilver2/template/breadcrumbs.html
+* Since: 3.1.0-RC3
+* Purpose: Add content after the breadcrumbs (outside of the breadcrumbs container)
+
+overall_header_breadcrumbs_before
+===
+* Locations:
+    + styles/prosilver/template/navbar_header.html
+    + styles/subsilver2/template/breadcrumbs.html
+* Since: 3.1.0-RC3
+* Purpose: Add content before the breadcrumbs (outside of the breadcrumbs container)
+
 overall_header_content_before
 ===
 * Locations:
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 8b9969aced..3402a618b0 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1067,7 +1067,7 @@ function phpbb_timezone_select($user, $default = '', $truncate = false)
 			$offset_string = phpbb_format_timezone_offset($offset);
 			$timezones['GMT' . $offset_string . ' - ' . $timezone] = array(
 				'tz'		=> $timezone,
-				'offest'	=> 'GMT' . $offset_string,
+				'offset'	=> 'GMT' . $offset_string,
 				'current'	=> $current_time,
 			);
 			if ($timezone === $default)
@@ -1084,14 +1084,14 @@ function phpbb_timezone_select($user, $default = '', $truncate = false)
 
 	foreach ($timezones as $timezone)
 	{
-		if ($opt_group != $timezone['offest'])
+		if ($opt_group != $timezone['offset'])
 		{
 			$tz_select .= ($opt_group) ? '</optgroup>' : '';
-			$tz_select .= '<optgroup label="' . $timezone['offest'] . ' - ' . $timezone['current'] . '">';
-			$opt_group = $timezone['offest'];
+			$tz_select .= '<optgroup label="' . $timezone['offset'] . ' - ' . $timezone['current'] . '">';
+			$opt_group = $timezone['offset'];
 
-			$selected = ($default_offset == $timezone['offest']) ? ' selected="selected"' : '';
-			$tz_dates .= '<option value="' . $timezone['offest'] . ' - ' . $timezone['current'] . '"' . $selected . '>' . $timezone['offest'] . ' - ' . $timezone['current'] . '</option>';
+			$selected = ($default_offset == $timezone['offset']) ? ' selected="selected"' : '';
+			$tz_dates .= '<option value="' . $timezone['offset'] . ' - ' . $timezone['current'] . '"' . $selected . '>' . $timezone['offset'] . ' - ' . $timezone['current'] . '</option>';
 		}
 
 		$label = $timezone['tz'];
@@ -1099,7 +1099,7 @@ function phpbb_timezone_select($user, $default = '', $truncate = false)
 		{
 			$label = $user->lang['timezones'][$label];
 		}
-		$title = $timezone['offest'] . ' - ' . $label;
+		$title = $timezone['offset'] . ' - ' . $label;
 
 		if ($truncate)
 		{
diff --git a/phpBB/phpbb/cron/task/core/tidy_search.php b/phpBB/phpbb/cron/task/core/tidy_search.php
index 2de744b7c1..2c30274dfa 100644
--- a/phpBB/phpbb/cron/task/core/tidy_search.php
+++ b/phpBB/phpbb/cron/task/core/tidy_search.php
@@ -54,8 +54,7 @@ class tidy_search extends \phpbb\cron\task\base
 	*/
 	public function run()
 	{
-		// Select the search method
-		$search_type = basename($this->config['search_type']);
+		$search_type = $this->config['search_type'];
 
 		// We do some additional checks in the module to ensure it can actually be utilised
 		$error = false;
@@ -78,10 +77,7 @@ class tidy_search extends \phpbb\cron\task\base
 	*/
 	public function is_runnable()
 	{
-		// Select the search method
-		$search_type = basename($this->config['search_type']);
-
-		return class_exists($search_type);
+		return class_exists($this->config['search_type']);
 	}
 
 	/**
diff --git a/phpBB/phpbb/template/context.php b/phpBB/phpbb/template/context.php
index 0a32879943..4ee48205c8 100644
--- a/phpBB/phpbb/template/context.php
+++ b/phpBB/phpbb/template/context.php
@@ -34,6 +34,11 @@ class context
 	*/
 	private $rootref;
 
+	/**
+	* @var bool
+	*/
+	private $num_rows_is_set;
+
 	public function __construct()
 	{
 		$this->clear();
@@ -46,6 +51,7 @@ class context
 	{
 		$this->tpldata = array('.' => array(0 => array()));
 		$this->rootref = &$this->tpldata['.'][0];
+		$this->num_rows_is_set = false;
 	}
 
 	/**
@@ -95,10 +101,59 @@ class context
 		// returning a reference directly is not
 		// something php is capable of doing
 		$ref = &$this->tpldata;
+
+		if (!$this->num_rows_is_set)
+		{
+			/*
+			* We do not set S_NUM_ROWS while adding a row, to reduce the complexity
+			* If we would set it on adding, each subsequent adding would cause
+			* n modifications, resulting in a O(n!) complexity, rather then O(n)
+			*/
+			foreach ($ref as $loop_name => &$loop_data)
+			{
+				if ($loop_name === '.')
+				{
+					continue;
+				}
+
+				$this->set_num_rows($loop_data);
+			}
+			$this->num_rows_is_set = true;
+		}
+
 		return $ref;
 	}
 
 	/**
+	* Set S_NUM_ROWS for each row in this template block
+	*
+	* @param array $loop_data
+	*/
+	protected function set_num_rows(&$loop_data)
+	{
+		$s_num_rows = sizeof($loop_data);
+		foreach ($loop_data as &$mod_block)
+		{
+			foreach ($mod_block as $sub_block_name => &$sub_block)
+			{
+				// If the key name is lowercase and the data is an array,
+				// it could be a template loop. So we set the S_NUM_ROWS there
+				// aswell.
+				if ($sub_block_name === strtolower($sub_block_name) && is_array($sub_block))
+				{
+					$this->set_num_rows($sub_block);
+				}
+			}
+
+			// Check whether we are inside a block before setting the variable
+			if (isset($mod_block['S_BLOCK_NAME']))
+			{
+				$mod_block['S_NUM_ROWS'] = $s_num_rows;
+			}
+		}
+	}
+
+	/**
 	* Returns a reference to template root scope.
 	*
 	* This function is public so that template renderer may invoke it.
@@ -123,6 +178,7 @@ class context
 	*/
 	public function assign_block_vars($blockname, array $vararray)
 	{
+		$this->num_rows_is_set = false;
 		if (strpos($blockname, '.') !== false)
 		{
 			// Nested block.
@@ -160,13 +216,6 @@ class context
 			// We're adding a new iteration to this block with the given
 			// variable assignments.
 			$str[$blocks[$blockcount]][] = $vararray;
-			$s_num_rows = sizeof($str[$blocks[$blockcount]]);
-
-			// Set S_NUM_ROWS
-			foreach ($str[$blocks[$blockcount]] as &$mod_block)
-			{
-				$mod_block['S_NUM_ROWS'] = $s_num_rows;
-			}
 		}
 		else
 		{
@@ -192,13 +241,6 @@ class context
 
 			// Add a new iteration to this block with the variable assignments we were given.
 			$this->tpldata[$blockname][] = $vararray;
-			$s_num_rows = sizeof($this->tpldata[$blockname]);
-
-			// Set S_NUM_ROWS
-			foreach ($this->tpldata[$blockname] as &$mod_block)
-			{
-				$mod_block['S_NUM_ROWS'] = $s_num_rows;
-			}
 		}
 
 		return true;
@@ -250,6 +292,7 @@ class context
 	*/
 	public function alter_block_array($blockname, array $vararray, $key = false, $mode = 'insert')
 	{
+		$this->num_rows_is_set = false;
 		if (strpos($blockname, '.') !== false)
 		{
 			// Nested block.
@@ -349,12 +392,6 @@ class context
 			$block[$key] = $vararray;
 			$block[$key]['S_ROW_COUNT'] = $block[$key]['S_ROW_NUM'] = $key;
 
-			// Set S_NUM_ROWS
-			foreach ($this->tpldata[$blockname] as &$mod_block)
-			{
-				$mod_block['S_NUM_ROWS'] = sizeof($this->tpldata[$blockname]);
-			}
-
 			return true;
 		}
 
@@ -382,6 +419,7 @@ class context
 	*/
 	public function destroy_block_vars($blockname)
 	{
+		$this->num_rows_is_set = false;
 		if (strpos($blockname, '.') !== false)
 		{
 			// Nested block.
diff --git a/phpBB/styles/prosilver/template/navbar_footer.html b/phpBB/styles/prosilver/template/navbar_footer.html
index f8ca83163b..4a9275c898 100644
--- a/phpBB/styles/prosilver/template/navbar_footer.html
+++ b/phpBB/styles/prosilver/template/navbar_footer.html
@@ -4,6 +4,7 @@
 	<ul id="nav-footer" class="linklist bulletin" role="menubar">
 		<li class="small-icon icon-home breadcrumbs">
 			<!-- IF U_SITE_HOME --><span class="crumb"><a href="{U_SITE_HOME}" data-navbar-reference="home">{L_SITE_HOME}</a></span><!-- ENDIF -->
+			<!-- EVENT overall_footer_breadcrumb_prepend -->
 			<span class="crumb"><a href="{U_INDEX}" data-navbar-reference="index">{L_INDEX}</a></span>
 			<!-- EVENT overall_footer_breadcrumb_append -->
 		</li>
diff --git a/phpBB/styles/prosilver/template/navbar_header.html b/phpBB/styles/prosilver/template/navbar_header.html
index a83cd5b0a2..ed34089550 100644
--- a/phpBB/styles/prosilver/template/navbar_header.html
+++ b/phpBB/styles/prosilver/template/navbar_header.html
@@ -83,8 +83,10 @@
 
 	<ul id="nav-breadcrumbs" class="linklist navlinks" role="menubar">
 		<!-- DEFINE $MICRODATA = ' itemtype="http://data-vocabulary.org/Breadcrumb" itemscope=""' -->
+		<!-- EVENT overall_header_breadcrumbs_before -->
 		<li class="small-icon icon-home breadcrumbs">
 			<!-- IF U_SITE_HOME --><span class="crumb"><a href="{U_SITE_HOME}"{$MICRODATA} data-navbar-reference="home">{L_SITE_HOME}</a></span><!-- ENDIF -->
+			<!-- EVENT overall_header_breadcrumb_prepend -->
 			<span class="crumb"><a href="{U_INDEX}" accesskey="h"{$MICRODATA} data-navbar-reference="index">{L_INDEX}</a></span>
 			<!-- BEGIN navlinks -->
 				<!-- EVENT overall_header_navlink_prepend -->
@@ -93,6 +95,7 @@
 			<!-- END navlinks -->
 			<!-- EVENT overall_header_breadcrumb_append -->
 		</li>
+		<!-- EVENT overall_header_breadcrumbs_after -->
 
 		<!-- IF S_DISPLAY_SEARCH and not S_IN_SEARCH -->
 			<li class="rightside responsive-search" style="display: none;"><a href="{U_SEARCH}" title="{L_SEARCH_ADV_EXPLAIN}" role="menuitem">{L_SEARCH}</a></li>
diff --git a/phpBB/styles/subsilver2/template/breadcrumbs.html b/phpBB/styles/subsilver2/template/breadcrumbs.html
index 3aa05bc0eb..25387da832 100644
--- a/phpBB/styles/subsilver2/template/breadcrumbs.html
+++ b/phpBB/styles/subsilver2/template/breadcrumbs.html
@@ -2,8 +2,10 @@
 	<table class="tablebg" width="100%" cellspacing="1" cellpadding="0" style="margin-top: 5px;">
 	<tr>
 		<td class="row1">
-			<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 --><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>
+			<!-- 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 --><!-- 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>
 			<!-- EVENT overall_footer_timezone_after -->
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 />
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index c9623293c6..9086feb390 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -469,11 +469,11 @@ if ($forum_data['forum_type'] == FORUM_POST)
 
 $forum_tracking_info = array();
 
-if ($user->data['is_registered'])
+if ($user->data['is_registered'] && $config['load_db_lastread'])
 {
 	$forum_tracking_info[$forum_id] = $forum_data['mark_time'];
 
-	if (!empty($global_announce_forums) && $config['load_db_lastread'])
+	if (!empty($global_announce_forums))
 	{
 		$sql = 'SELECT forum_id, mark_time
 			FROM ' . FORUMS_TRACK_TABLE . '