Merge branch 'MDL-56576-master' of git://github.com/damyon/moodle

moodle · Nov 3, 2016 · 8b0064d · 8b0064d
2 parents 11bafc2 + 057e1a1
commit 8b0064d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/admin/search.php b/admin/search.php
@@ -19,7 +19,7 @@
 $focus = '';
 
 // now we'll deal with the case that the admin has submitted the form with changed settings
-if ($data = data_submitted() and confirm_sesskey()) {
+if ($data = data_submitted() and confirm_sesskey() and isset($data->action) and $data->action == 'save-settings') {
     require_capability('moodle/site:config', $context);
     if (admin_write_settings($data)) {
         redirect($PAGE->url, get_string('changessaved'), null, \core\output\notification::NOTIFY_SUCCESS);

diff --git a/admin/templates/settings_search_results.mustache b/admin/templates/settings_search_results.mustache
@@ -37,6 +37,7 @@
 <form action="{{actionurl}}" method="post" id="adminsettings">
     <div>
         <input type="hidden" name="sesskey" value="{{sesskey}}">
+        <input type="hidden" name="action" value="save-settings">
     </div>
     <fieldset>
         <div class="clearer"></div>