Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'MDL-37548-m23' of git://github.com/andrewnicols/moodle …

…into MOODLE_23_STABLE
  • Loading branch information...
commit c01e5b0cd6f1de9c322d0fe336ee755b2c059d23 2 parents b0610c8 + 0bbbabb
@samhemelryk samhemelryk authored
Showing with 1 addition and 1 deletion.
  1. +1 −1  lib/adminlib.php
View
2  lib/adminlib.php
@@ -7679,7 +7679,7 @@ public function output_html($data, $query = '') {
$PAGE->requires->js_init_call('M.util.init_colour_picker', array($this->get_id(), $this->previewconfig));
$content = html_writer::start_tag('div', array('class'=>'form-colourpicker defaultsnext'));
$content .= html_writer::tag('div', $OUTPUT->pix_icon('i/loading', get_string('loading', 'admin'), 'moodle', array('class'=>'loadingicon')), array('class'=>'admin_colourpicker clearfix'));
- $content .= html_writer::empty_tag('input', array('type'=>'text','id'=>$this->get_id(), 'name'=>$this->get_full_name(), 'value'=>$this->get_setting(), 'size'=>'12'));
+ $content .= html_writer::empty_tag('input', array('type'=>'text','id'=>$this->get_id(), 'name'=>$this->get_full_name(), 'value'=>$data, 'size'=>'12'));
if (!empty($this->previewconfig)) {
$content .= html_writer::empty_tag('input', array('type'=>'button','id'=>$this->get_id().'_preview', 'value'=>get_string('preview'), 'class'=>'admin_colourpicker_preview'));
}
Please sign in to comment.
Something went wrong with that request. Please try again.