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/memberlist.php | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'phpBB/memberlist.php')

diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index b9bf0fde69..2f2c823feb 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -365,8 +365,8 @@ switch ($mode)
 		}
 
 		$template->assign_block_vars('navlinks', array(
-			'FORUM_NAME'	=> $page_title,
-			'U_VIEW_FORUM'	=> append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=team"),
+			'BREADCRUMB_NAME'	=> $page_title,
+			'U_BREADCRUMB'		=> append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=team"),
 		));
 
 		$template->assign_vars(array(
@@ -467,8 +467,8 @@ switch ($mode)
 		}
 
 		$template->assign_block_vars('navlinks', array(
-			'FORUM_NAME'	=> $page_title,
-			'U_VIEW_FORUM'	=> append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=contact&amp;action=$action&amp;u=$user_id"),
+			'BREADCRUMB_NAME'	=> $page_title,
+			'U_BREADCRUMB'		=> append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=contact&amp;action=$action&amp;u=$user_id"),
 		));
 
 		// Send vars to the template
@@ -876,12 +876,12 @@ switch ($mode)
 		$template_html = 'memberlist_view.html';
 
 		$template->assign_block_vars('navlinks', array(
-			'FORUM_NAME'	=> $user->lang('MEMBERLIST'),
-			'U_VIEW_FORUM'	=> append_sid("{$phpbb_root_path}memberlist.$phpEx"),
+			'BREADCRUMB_NAME'	=> $user->lang('MEMBERLIST'),
+			'U_BREADCRUMB'		=> append_sid("{$phpbb_root_path}memberlist.$phpEx"),
 		));
 		$template->assign_block_vars('navlinks', array(
-			'FORUM_NAME'	=> $member['username'],
-			'U_VIEW_FORUM'	=> append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=viewprofile&u=$user_id"),
+			'BREADCRUMB_NAME'	=> $member['username'],
+			'U_BREADCRUMB'		=> append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=viewprofile&u=$user_id"),
 		));
 
 	break;
@@ -950,8 +950,8 @@ switch ($mode)
 
 			generate_forum_nav($topic_data);
 			$template->assign_block_vars('navlinks', array(
-				'FORUM_NAME'	=> $topic_data['topic_title'],
-				'U_VIEW_FORUM'	=> append_sid("{$phpbb_root_path}viewtopic.$phpEx", "t=$topic_id"),
+				'BREADCRUMB_NAME'	=> $topic_data['topic_title'],
+				'U_BREADCRUMB'		=> append_sid("{$phpbb_root_path}viewtopic.$phpEx", "t=$topic_id"),
 			));
 
 			$navlink_name = $user->lang('EMAIL_TOPIC');
@@ -964,8 +964,8 @@ switch ($mode)
 		}
 
 		$template->assign_block_vars('navlinks', array(
-			'FORUM_NAME'	=> $navlink_name,
-			'U_VIEW_FORUM'	=> $navlink_url,
+			'BREADCRUMB_NAME'	=> $navlink_name,
+			'U_BREADCRUMB'		=> $navlink_url,
 		));
 
 	break;
@@ -1006,8 +1006,8 @@ switch ($mode)
 		$template_html = 'memberlist_body.html';
 
 		$template->assign_block_vars('navlinks', array(
-			'FORUM_NAME'	=> $page_title,
-			'U_VIEW_FORUM'	=> append_sid("{$phpbb_root_path}memberlist.$phpEx"),
+			'BREADCRUMB_NAME'	=> $page_title,
+			'U_BREADCRUMB'		=> append_sid("{$phpbb_root_path}memberlist.$phpEx"),
 		));
 
 		/* @var $pagination \phpbb\pagination */
@@ -1316,8 +1316,8 @@ switch ($mode)
 			}
 
 			$template->assign_block_vars('navlinks', array(
-				'FORUM_NAME'	=> $group_helper->get_name($group_row['group_name']),
-				'U_VIEW_FORUM'	=> append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=group&amp;g=$group_id"),
+				'BREADCRUMB_NAME'	=> $group_helper->get_name($group_row['group_name']),
+				'U_BREADCRUMB'		=> append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=group&amp;g=$group_id"),
 			));
 
 			$template->assign_vars(array(
-- 
cgit v1.2.1