From 4e3ac92d05c8e192ef8b794a4f3153b174d9bfd3 Mon Sep 17 00:00:00 2001
From: Jakub Senko <jakubsenko@gmail.com>
Date: Mon, 15 Aug 2016 17:34:33 +0200
Subject: [ticket/14573] Add UCP breadcrumbs
PHPBB3-14573
---
phpBB/includes/functions_module.php | 8 ++++++++
1 file changed, 8 insertions(+)
(limited to 'phpBB/includes/functions_module.php')
diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php
index 88dafc4300..8e9719adfa 100644
--- a/phpBB/includes/functions_module.php
+++ b/phpBB/includes/functions_module.php
@@ -933,6 +933,14 @@ class p_master
'U_TITLE' => $u_title
);
+ if (isset($this->module_cache['parents'][$item_ary['id']]) || $item_ary['id'] == $this->p_id)
+ {
+ $template->assign_block_vars('navlinks', array(
+ 'FORUM_NAME' => $item_ary['lang'],
+ 'U_VIEW_FORUM' => $u_title,
+ ));
+ }
+
$template->assign_block_vars($use_tabular_offset, array_merge($tpl_ary, array_change_key_case($item_ary, CASE_UPPER)));
}
--
cgit v1.2.1
From 9f20ff7b9e998688c06737a546fbcaabd87b22ef Mon Sep 17 00:00:00 2001
From: Jakub Senko <jakubsenko@gmail.com>
Date: Mon, 18 Jun 2018 19:46:37 +0200
Subject: [ticket/12591] Improve breadcrumb naming and extend it's usage
PHPBB3-12591
---
phpBB/includes/functions_module.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'phpBB/includes/functions_module.php')
diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php
index 8e9719adfa..9c4ee1a631 100644
--- a/phpBB/includes/functions_module.php
+++ b/phpBB/includes/functions_module.php
@@ -936,8 +936,8 @@ class p_master
if (isset($this->module_cache['parents'][$item_ary['id']]) || $item_ary['id'] == $this->p_id)
{
$template->assign_block_vars('navlinks', array(
- 'FORUM_NAME' => $item_ary['lang'],
- 'U_VIEW_FORUM' => $u_title,
+ 'BREADCRUMB_NAME' => $item_ary['lang'],
+ 'U_BREADCRUMB' => $u_title,
));
}
--
cgit v1.2.1
From 89ae1c3221c40b6394aa5da6bfc87d2f19ae4c9a Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 11 May 2019 17:30:43 +0200
Subject: [ticket/16052] Update version numbers to 3.3
PHPBB3-16052
---
phpBB/includes/functions_module.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'phpBB/includes/functions_module.php')
diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php
index 9c4ee1a631..510d98ec11 100644
--- a/phpBB/includes/functions_module.php
+++ b/phpBB/includes/functions_module.php
@@ -123,7 +123,7 @@ class p_master
// We "could" build a true tree with this function - maybe mod authors want to use this...
// Functions for traversing and manipulating the tree are not available though
- // We might re-structure the module system to use true trees in 3.2.x...
+ // We might re-structure the module system to use true trees in 4.0
// $tree = $this->build_tree($this->module_cache['modules'], $this->module_cache['parents']);
// Clean up module cache array to only let survive modules the user can access
--
cgit v1.2.1
From dcab0762210a4059cca7458344dcc1aeb0360c42 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Sun, 29 Dec 2019 02:12:36 +0700
Subject: [ticket/16276] Further fix PHP nightly tests
PHPBB3-16276
---
phpBB/includes/functions_module.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'phpBB/includes/functions_module.php')
diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php
index 510d98ec11..e90c11f884 100644
--- a/phpBB/includes/functions_module.php
+++ b/phpBB/includes/functions_module.php
@@ -445,7 +445,7 @@ class p_master
break;
default:
- if (!preg_match('#(?:' . implode(array_keys($valid_tokens), ')|(?:') . ')#', $token))
+ if (!preg_match('#(?:' . implode(')|(?:', array_keys($valid_tokens)) . ')#', $token))
{
$token = '';
}
--
cgit v1.2.1