From b673aaafe295356b96e15efddaabf2ac7ee00a36 Mon Sep 17 00:00:00 2001 From: cigamit Date: Thu, 29 Aug 2019 07:26:11 -0500 Subject: [PATCH] Resolving Issue #2912 Resolve navigation caching array to string conversion issues --- CHANGELOG | 1 + lib/functions.php | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 7cedd8fa4..34d4f9a76 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -39,6 +39,7 @@ Cacti CHANGELOG -issue#2907: SSL column for multiple pollers can be incorrectly set causing SQL errors -issue#2908: When URL_PATH is blank, it should assume that it is '/' -issue#2909: Correct usage of affect vs effect in strings +-issue#2912: Resolve navigation caching array to string conversion issues -issue#2913: Selection "Graph type" not saved and restored after going to page two 1.2.5 diff --git a/lib/functions.php b/lib/functions.php index 33b398324..10a023507 100644 --- a/lib/functions.php +++ b/lib/functions.php @@ -2385,6 +2385,11 @@ function draw_navigation_text($type = 'url') { $navigation = api_plugin_hook_function('draw_navigation_text', $navigation); $current_page = get_current_page(); + // Do an error check here for bad plugins manipulating the cache + if (!is_array($nav_level_cache)) { + $nav_level_cache = array(); + } + if (!isempty_request_var('action')) { get_filter_request_var('action', FILTER_VALIDATE_REGEXP, array('options' => array('regexp' => '/^([-a-zA-Z0-9_\s]+)$/'))); }