From c3fe18506b1074e7c07c8a16d0d900d040da8462 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Luca=20B=C3=B6sch?= <luca.boesch@bfh.ch>
Date: Thu, 10 Oct 2019 10:04:05 +0200
Subject: [PATCH] MDL-66847 webservice: Correct breadcrumb + title for ws
 documentation.

---
 lang/en/deprecated.txt | 1 +
 lang/en/webservice.php | 4 +++-
 webservice/wsdoc.php   | 9 +++++----
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/lang/en/deprecated.txt b/lang/en/deprecated.txt
index abef9f9910a..7753147fe79 100644
--- a/lang/en/deprecated.txt
+++ b/lang/en/deprecated.txt
@@ -120,3 +120,4 @@ global,core_calendar
 globalevent,core_calendar
 globalevents,core_calendar
 eventtypeglobal,core_calendar
+documentation,core_webservice
diff --git a/lang/en/webservice.php b/lang/en/webservice.php
index c5ee85c6523..2cfd47c7267 100644
--- a/lang/en/webservice.php
+++ b/lang/en/webservice.php
@@ -60,7 +60,6 @@ $string['deletetokenconfirm'] = 'Do you really want to delete this web service t
 $string['disabledwarning'] = 'All web service protocols are disabled.  The "Enable web services" setting can be found in Advanced features.';
 $string['doc'] = 'Documentation';
 $string['docaccessrefused'] = 'You are not allowed to see the documentation for this token';
-$string['documentation'] = 'web service documentation';
 $string['downloadfiles'] = 'Can download files';
 $string['downloadfiles_help'] = 'If enabled, any user can download files with their security keys. Of course they are restricted to the files they are allowed to download in the site.';
 $string['editaservice'] = 'Edit service';
@@ -241,3 +240,6 @@ $string['wsdocumentationintro'] = 'To create a client we advise you to read the
 $string['wsdocumentationlogin'] = 'or enter your web service username and password:';
 $string['wspassword'] = 'Web service password';
 $string['wsusername'] = 'Web service username';
+
+// Deprecated since Moodle 3.9.
+$string['documentation'] = 'web service documentation';
diff --git a/webservice/wsdoc.php b/webservice/wsdoc.php
index f5bb7ab3cb5..b3ed68e93c5 100644
--- a/webservice/wsdoc.php
+++ b/webservice/wsdoc.php
@@ -35,17 +35,18 @@ $tokenid = required_param('id', PARAM_INT);
 // PAGE settings
 $PAGE->set_context($usercontext);
 $PAGE->set_url('/user/wsdoc.php');
-$PAGE->set_title(get_string('documentation', 'webservice'));
-$PAGE->set_heading(get_string('documentation', 'webservice'));
+$PAGE->set_title(get_string('wsdocumentation', 'webservice'));
+$PAGE->set_heading(get_string('wsdocumentation', 'webservice'));
 $PAGE->set_pagelayout('standard');
 
 // nav bar
 $PAGE->navbar->ignore_active(true);
-$PAGE->navbar->add(get_string('usercurrentsettings'));
+$PAGE->navbar->add(get_string('preferences'), new moodle_url('/user/preferences.php'));
+$PAGE->navbar->add(get_string('useraccount'));
 $PAGE->navbar->add(get_string('securitykeys', 'webservice'),
         new moodle_url('/user/managetoken.php', 
                 array('id' => $tokenid, 'sesskey' => sesskey())));
-$PAGE->navbar->add(get_string('documentation', 'webservice'));
+$PAGE->navbar->add(get_string('wsdocumentation', 'webservice'));
 
 // check web service are enabled
 if (empty($CFG->enablewsdocumentation)) {
-- 
2.11.4.GIT