From 12968cd8295343edfc33859658e4eafa02cd5c10 Mon Sep 17 00:00:00 2001
From: Stefan Topfstedt <Stefan.Topfstedt@ucsf.edu>
Date: Wed, 29 Oct 2025 16:43:34 -0700
Subject: [PATCH] MDL-86416 navigation: Render the more menu only when it's not
 empty

Co-authored-by: Jun Pataleta <jun@moodle.com>
---
 .../classes/navigation/output/more_menu.php   |  4 ++
 .../navigation/output/more_menu_test.php      | 46 +++++++++++++++++++
 2 files changed, 50 insertions(+)
 create mode 100644 public/lib/tests/navigation/output/more_menu_test.php

diff --git a/public/lib/classes/navigation/output/more_menu.php b/public/lib/classes/navigation/output/more_menu.php
index 89b9c4c8ed9..3b38ff060f6 100644
--- a/public/lib/classes/navigation/output/more_menu.php
+++ b/public/lib/classes/navigation/output/more_menu.php
@@ -83,6 +83,10 @@ class more_menu implements renderable, templatable {
             $data['nodecollection'] = $this->content;
         } else {
             $data['nodearray'] = (array) $this->content;
+            // If there is no node array to render then return an empty array.
+            if (empty($data['nodearray'])) {
+                return [];
+            }
         }
         $data['moremenuid'] = uniqid();
 
diff --git a/public/lib/tests/navigation/output/more_menu_test.php b/public/lib/tests/navigation/output/more_menu_test.php
new file mode 100644
index 00000000000..db817f5f697
--- /dev/null
+++ b/public/lib/tests/navigation/output/more_menu_test.php
@@ -0,0 +1,46 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace core\navigation\output;
+
+use basic_testcase;
+use core\output\renderer_base;
+use stdClass;
+
+/**
+ * More menu navigation renderable test.
+ *
+ * @package     core
+ * @category    navigation
+ * @copyright   Stefan Topfstedt
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @covers      \core\navigation\output\more_menu
+ */
+final class more_menu_test extends basic_testcase {
+    /**
+     * Checks that export_for_template() returns an empty array if the given content is empty.
+     * See MDL-86416.
+     *
+     * @return void
+     */
+    public function test_export_for_template_returns_empty_array(): void {
+        $moremenu = new more_menu(new stdClass(), 'whatever', false, false);
+        $output = $this->createStub(renderer_base::class);
+        $data = $moremenu->export_for_template($output);
+        $this->assertIsArray($data);
+        $this->assertEmpty($data);
+    }
+}