From 560cea838b8ff2b975618f4ad02fb463cadc3979 Mon Sep 17 00:00:00 2001 From: JD Date: Tue, 12 Jul 2016 19:45:08 -0400 Subject: [PATCH] MDL-54977 blocks_navigation: Use html_writer::random_id for id uniqid() may returns the same id for faster machines (seen on iis) so use html_writer::random_id(), to ensure id is different and navigation don't break --- blocks/navigation/renderer.php | 2 +- blocks/settings/renderer.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/blocks/navigation/renderer.php b/blocks/navigation/renderer.php index 8ead8fe6968..c64e55d4d84 100644 --- a/blocks/navigation/renderer.php +++ b/blocks/navigation/renderer.php @@ -86,7 +86,7 @@ class block_navigation_renderer extends plugin_renderer_base { continue; } - $id = $item->id ? $item->id : uniqid(); + $id = $item->id ? $item->id : html_writer::random_id(); $content = $item->get_content(); $title = $item->get_title(); $ulattr = ['id' => $id . '_group', 'role' => 'group']; diff --git a/blocks/settings/renderer.php b/blocks/settings/renderer.php index 10afa754c91..34e99ef7d93 100644 --- a/blocks/settings/renderer.php +++ b/blocks/settings/renderer.php @@ -75,7 +75,7 @@ class block_settings_renderer extends plugin_renderer_base { } $content = $this->output->render($item); - $id = $item->id ? $item->id : uniqid(); + $id = $item->id ? $item->id : html_writer::random_id(); $ulattr = ['id' => $id . '_group', 'role' => 'group']; $liattr = ['class' => [$item->get_css_type(), 'depth_'.$depth], 'tabindex' => '-1']; $pattr = ['class' => ['tree_item'], 'role' => 'treeitem'];