aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_display.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-06-22 20:50:48 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-06-22 20:50:48 +0200
commit0d57cb37fb08d2e88510fdd69a1dc1730dbf23ff (patch)
tree44406d1cc41a501688bda56456f3368052c96ed3 /phpBB/includes/functions_display.php
parent8a4c50d4b1f726a9b1888a4b612ff2854bbdf8c0 (diff)
parent80ac276971908ee8aa4ccd1941b79f7aaf93c523 (diff)
downloadforums-0d57cb37fb08d2e88510fdd69a1dc1730dbf23ff.tar
forums-0d57cb37fb08d2e88510fdd69a1dc1730dbf23ff.tar.gz
forums-0d57cb37fb08d2e88510fdd69a1dc1730dbf23ff.tar.bz2
forums-0d57cb37fb08d2e88510fdd69a1dc1730dbf23ff.tar.xz
forums-0d57cb37fb08d2e88510fdd69a1dc1730dbf23ff.zip
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: [ticket/12646] Changed to navlinks.MICRODATA [ticket/12646] Add check for navlinks.FORUM_ID [ticket/12646] Changed index/home data attr & updated subsilver [ticket/12646] Add data-f attribute to breadcrumb links
Diffstat (limited to 'phpBB/includes/functions_display.php')
-rw-r--r--phpBB/includes/functions_display.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 4606a9f7ca..23c6a15ca4 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -674,6 +674,8 @@ function generate_forum_nav(&$forum_data)
// Get forum parents
$forum_parents = get_forum_parents($forum_data);
+ $microdata_attr = 'data-forum-id';
+
// Build navigation links
if (!empty($forum_parents))
{
@@ -693,6 +695,7 @@ function generate_forum_nav(&$forum_data)
'S_IS_POST' => ($parent_type == FORUM_POST) ? true : false,
'FORUM_NAME' => $parent_name,
'FORUM_ID' => $parent_forum_id,
+ 'MICRODATA' => $microdata_attr . '="' . $parent_forum_id . '"',
'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $parent_forum_id))
);
}
@@ -704,6 +707,7 @@ function generate_forum_nav(&$forum_data)
'S_IS_POST' => ($forum_data['forum_type'] == FORUM_POST) ? true : false,
'FORUM_NAME' => $forum_data['forum_name'],
'FORUM_ID' => $forum_data['forum_id'],
+ 'MICRODATA' => $microdata_attr . '="' . $forum_data['forum_id'] . '"',
'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $forum_data['forum_id']))
);