Merge branch 'MDL-34984' of git://github.com/rwijaya/moodle

This commit is contained in:
Eloy Lafuente (stronk7) 2012-09-11 16:28:46 +02:00
commit e633ea6b46

View File

@ -6377,9 +6377,8 @@ function format_admin_setting($setting, $title='', $form='', $description='', $l
$str = ' $str = '
<div class="form-item clearfix" id="admin-'.$setting->name.'"> <div class="form-item clearfix" id="admin-'.$setting->name.'">
<div class="form-label"> <div class="form-label">
<label '.$labelfor.'>'.highlightfast($query, $title).'<span class="form-shortname">'.highlightfast($query, $name).'</span> <label '.$labelfor.'>'.highlightfast($query, $title).$override.$warning.'</label>
'.$override.$warning.' <span class="form-shortname">'.highlightfast($query, $name).'</span>
</label>
</div> </div>
<div class="form-setting">'.$form.$defaultinfo.'</div> <div class="form-setting">'.$form.$defaultinfo.'</div>
<div class="form-description">'.highlight($query, markdown_to_html($description)).'</div> <div class="form-description">'.highlight($query, markdown_to_html($description)).'</div>