Merge pull request #960 from sarahjcotton/WR487120-T20-compatibility

WR487120: T20 compatibility

Author: danmarsden

classes/admin/setting_button.php

@@ -86,6 +86,6 @@ public function output_html($data, $query = '') {
             $element = $OUTPUT->render_from_template('auth_saml2/setting_configbutton', $context);
         }
 
-        return format_admin_setting($this, $this->visiblename, $element, $this->description);
+        return $this->render('', $element, null, $this->visiblename, '', '', $this->description);
     }
 }

classes/admin/setting_textonly.php

@@ -40,6 +40,6 @@ class setting_textonly extends heading {
      * @return string Returns an HTML string
      */
     public function output_html($data, $query = '') {
-        return format_admin_setting($this, $this->visiblename, '', $this->description);
+        return $this->render('', $this->visiblename, '', '', '', '', $this->description);
     }
 }