admin settings/blocklib: MDL-19108 Error when saving any admin settings

Regression from MDL-19010

diff --git a/admin/settings.php b/admin/settings.php
index 847814b426970b9db47d6e1443869fdd15aa250f..667ee3ab98464557fa492a27cb314fe05a8ea31b 100644 (file)
--- a/admin/settings.php
+++ b/admin/settings.php
@@ -48,7 +48,7 @@ if ($data = data_submitted() and confirm_sesskey()) {
         $focus = $firsterror->id;
     }
     $adminroot = admin_get_root(true); //reload tree
-    $settingspage = $adminroot->locate($section);
+    $settingspage = $adminroot->locate($section, true);
 }
 
 if ($PAGE->user_allowed_editing() && $adminediting != -1) {
@@ -71,7 +71,7 @@ if (empty($SITE->fullname)) {
 
     echo '<form action="settings.php" method="post" id="adminsettings">';
     echo '<div class="settingsform clearfix">';
-    $PAGE->url->hidden_params_out();
+    echo $PAGE->url->hidden_params_out();
     echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
     echo '<input type="hidden" name="return" value="'.$return.'" />';
 
@@ -138,7 +138,7 @@ if (empty($SITE->fullname)) {
 
     echo '<form action="settings.php" method="post" id="adminsettings">';
     echo '<div class="settingsform clearfix">';
-    $PAGE->url->hidden_params_out();
+    echo $PAGE->url->hidden_params_out();
     echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
     echo '<input type="hidden" name="return" value="'.$return.'" />';
     print_heading($settingspage->visiblename);