From f11daad97a09a124d3fe60bf9ba8f35ecc725a91 Mon Sep 17 00:00:00 2001
From: Jun Pataleta <jun@moodle.com>
Date: Fri, 4 Aug 2023 16:42:08 +0800
Subject: [PATCH] MDL-78806 admin: Display the most unique information in the
 title first

* Page titles should display the most unique information first. For
admin pages it would be useful to display the information that
is unique to the page first before the broader categories that the
page belongs to.
* Also use the new page title separator constant.
---
 admin/category.php | 3 +--
 admin/settings.php | 4 +---
 lib/adminlib.php   | 4 +---
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/admin/category.php b/admin/category.php
index f6f6d52c9c3..e990383cadb 100644
--- a/admin/category.php
+++ b/admin/category.php
@@ -131,8 +131,7 @@ if ($savebutton) {
     $outputhtml .= html_writer::end_tag('div');
 }
 
-$visiblepathtosection = array_reverse($settingspage->visiblepath);
-$PAGE->set_title(implode(": ",$visiblepathtosection));
+$PAGE->set_title(implode(moodle_page::TITLE_SEPARATOR, $settingspage->visiblepath));
 $PAGE->set_heading($SITE->fullname);
 if ($buttons) {
     $PAGE->set_button($buttons);
diff --git a/admin/settings.php b/admin/settings.php
index a67c8a075a6..48171745b3a 100644
--- a/admin/settings.php
+++ b/admin/settings.php
@@ -129,9 +129,7 @@ if (empty($SITE->fullname)) {
         $PAGE->set_button($buttons);
     }
 
-    $visiblepathtosection = array_reverse($settingspage->visiblepath);
-
-    $PAGE->set_title(implode(": ",$visiblepathtosection));
+    $PAGE->set_title(implode(moodle_page::TITLE_SEPARATOR, $settingspage->visiblepath));
     $PAGE->set_heading($SITE->fullname);
     echo $OUTPUT->header();
 
diff --git a/lib/adminlib.php b/lib/adminlib.php
index 52b4ee2fe0a..a4c6ad400c6 100644
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -8722,8 +8722,6 @@ function admin_externalpage_setup($section, $extrabutton = '', array $extraurlpa
         $USER->editing = $adminediting;
     }
 
-    $visiblepathtosection = array_reverse($extpage->visiblepath);
-
     if ($PAGE->user_allowed_editing() && !$PAGE->theme->haseditswitch) {
         if ($PAGE->user_is_editing()) {
             $caption = get_string('blockseditoff');
@@ -8735,7 +8733,7 @@ function admin_externalpage_setup($section, $extrabutton = '', array $extraurlpa
         $PAGE->set_button($OUTPUT->single_button($url, $caption, 'get'));
     }
 
-    $PAGE->set_title(implode(": ", $visiblepathtosection));
+    $PAGE->set_title(implode(moodle_page::TITLE_SEPARATOR, $extpage->visiblepath));
     $PAGE->set_heading($SITE->fullname);
 
     if ($hassiteconfig && empty($options['nosearch'])) {