From 6655d6ef6328ddef212385b58cf165062a86f805 Mon Sep 17 00:00:00 2001 From: Juan Leyva Date: Fri, 30 Jan 2015 13:11:14 +0100 Subject: [PATCH] MDL-48294 settings: enablemobilewebservice appears twice --- admin/settings/plugins.php | 3 --- lib/adminlib.php | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/admin/settings/plugins.php b/admin/settings/plugins.php index 7a1551a4d8b..f0455b7b594 100644 --- a/admin/settings/plugins.php +++ b/admin/settings/plugins.php @@ -282,9 +282,6 @@ if ($hassiteconfig) { $ADMIN->add('webservicesettings', new admin_externalpage('webservicedocumentation', new lang_string('wsdocapi', 'webservice'), "$CFG->wwwroot/$CFG->admin/webservice/documentation.php", 'moodle/site:config', false)); /// manage service $temp = new admin_settingpage('externalservices', new lang_string('externalservices', 'webservice')); - $temp->add(new admin_setting_enablemobileservice('enablemobilewebservice', - new lang_string('enablemobilewebservice', 'admin'), - new lang_string('configenablemobilewebservice', 'admin', $enablemobiledoclink), 0)); $temp->add(new admin_setting_heading('manageserviceshelpexplaination', new lang_string('information', 'webservice'), new lang_string('servicehelpexplanation', 'webservice'))); $temp->add(new admin_setting_manageexternalservices()); $ADMIN->add('webservicesettings', $temp); diff --git a/lib/adminlib.php b/lib/adminlib.php index 192b66b128a..37da3db1b7e 100644 --- a/lib/adminlib.php +++ b/lib/adminlib.php @@ -7847,11 +7847,11 @@ class admin_setting_webservicesoverview extends admin_setting { get_string('enablemobilewebservice', 'admin'), get_string('configenablemobilewebservice', 'admin', ''), 0); //we don't want to display it but to know the ws mobile status - $manageserviceurl = new moodle_url("/admin/settings.php?section=externalservices"); + $manageserviceurl = new moodle_url("/admin/settings.php?section=mobile"); $wsmobileparam = new stdClass(); $wsmobileparam->enablemobileservice = get_string('enablemobilewebservice', 'admin'); $wsmobileparam->manageservicelink = html_writer::link($manageserviceurl, - get_string('externalservices', 'webservice')); + get_string('mobile', 'admin')); $mobilestatus = $enablemobile->get_setting()?get_string('mobilewsenabled', 'webservice'):get_string('mobilewsdisabled', 'webservice'); $wsmobileparam->wsmobilestatus = html_writer::tag('strong', $mobilestatus); $return .= $OUTPUT->heading(get_string('enablemobilewebservice', 'admin'), 3, 'main');