diff options
| -rw-r--r-- | build/build.xml | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v31x/v318.php | 31 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/navbar_footer.html | 4 |
3 files changed, 36 insertions, 1 deletions
diff --git a/build/build.xml b/build/build.xml index 6d5b652b0a..b31f36cae0 100644 --- a/build/build.xml +++ b/build/build.xml @@ -4,7 +4,7 @@ <!-- a few settings for the build --> <property name="newversion" value="3.2.0-b2-dev" /> <property name="prevversion" value="3.2.0-b1" /> - <property name="olderversions" value="3.0.14, 3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.1.4, 3.1.5, 3.1.6, 3.1.7, 3.1.7-pl1, 3.2.0-a1, 3.2.0-a2" /> + <property name="olderversions" value="3.0.14, 3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.1.4, 3.1.5, 3.1.6, 3.1.7, 3.1.7-pl1, 3.1.8, 3.2.0-a1, 3.2.0-a2" /> <!-- no configuration should be needed beyond this point --> <property name="oldversions" value="${olderversions}, ${prevversion}" /> diff --git a/phpBB/phpbb/db/migration/data/v31x/v318.php b/phpBB/phpbb/db/migration/data/v31x/v318.php new file mode 100644 index 0000000000..b254279a5d --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v31x/v318.php @@ -0,0 +1,31 @@ +<?php +/** +* +* This file is part of the phpBB Forum Software package. +* +* @copyright (c) phpBB Limited <https://www.phpbb.com> +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +namespace phpbb\db\migration\data\v31x; + +class v318 extends \phpbb\db\migration\migration +{ + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v31x\v318rc1', + ); + } + + public function update_data() + { + return array( + array('config.update', array('version', '3.1.8')), + ); + } +} diff --git a/phpBB/styles/prosilver/template/navbar_footer.html b/phpBB/styles/prosilver/template/navbar_footer.html index a7864e3a3d..4e3d1e295e 100644 --- a/phpBB/styles/prosilver/template/navbar_footer.html +++ b/phpBB/styles/prosilver/template/navbar_footer.html @@ -4,18 +4,22 @@ <ul id="nav-footer" class="nav-footer linklist" role="menubar"> <li class="breadcrumbs"> <!-- IF U_SITE_HOME --> + {% spaceless %} <span class="crumb"> <a href="{U_SITE_HOME}" data-navbar-reference="home"> <i class="icon fa-home fa-fw" aria-hidden="true"></i><span>{L_SITE_HOME}</span> </a> </span> + {% endspaceless %} <!-- ENDIF --> <!-- EVENT overall_footer_breadcrumb_prepend --> + {% spaceless %} <span class="crumb"> <a href="{U_INDEX}" data-navbar-reference="index"> <!-- IF not U_SITE_HOME --><i class="icon fa-home fa-fw" aria-hidden="true"></i><!-- ENDIF --><span>{L_INDEX}</span> </a> </span> + {% endspaceless %} <!-- EVENT overall_footer_breadcrumb_append --> </li> <!-- IF U_WATCH_FORUM_LINK and not S_IS_BOT --> |