From: nicolasconnault <nicolasconnault>
Date: Thu, 6 Aug 2009 06:58:14 +0000 (+0000)
Subject: MDL-19756 Added shortcut to html_select_option to make checkboxes
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=56d72c5e81437a1ac4dd3ebba9e29ffcd0ba0ed9;p=moodle.git

MDL-19756 Added shortcut to html_select_option to make checkboxes
---

diff --git a/lib/deprecatedlib.php b/lib/deprecatedlib.php
index 0d96eecc6c..64b5d4a380 100644
--- a/lib/deprecatedlib.php
+++ b/lib/deprecatedlib.php
@@ -3393,14 +3393,7 @@ function print_checkbox ($name, $value, $checked = true, $label = '', $alt = '',
         debugging('The use of the $script param in print_checkbox has not been migrated into $OUTPUT->checkbox. Please use $checkbox->add_action().', DEBUG_DEVELOPER);
     }
 
-    $checkbox = new html_select_option();
-    $checkbox->value = $value;
-    $checkbox->selected = $checked;
-    $checkbox->text = $label;
-    $checkbox->label->text = $label;
-    $checkbox->alt = $alt;
-
-    $output = $OUTPUT->checkbox($checkbox, $name);
+    $output = $OUTPUT->checkbox(html_select_option::make_checkbox($value, $checked, $label, $alt), $name);
 
     if (empty($return)) {
         echo $output;
diff --git a/lib/outputlib.php b/lib/outputlib.php
index f8a42c8202..8b9adba68f 100644
--- a/lib/outputlib.php
+++ b/lib/outputlib.php
@@ -4184,6 +4184,24 @@ class html_select_option extends moodle_html_component {
 
         parent::prepare();
     }
+
+    /**
+     * Shortcut for making a checkbox-ready option
+     * @param string $value The value of the checkbox
+     * @param boolean $checked
+     * @param string $label
+     * @param string $alt
+     * @return html_select_option A component ready for $OUTPUT->checkbox()
+     */
+    public function make_checkbox($value, $checked, $label='', $alt='') {
+        $checkbox = new html_select_option();
+        $checkbox->value = $value;
+        $checkbox->selected = $checked;
+        $checkbox->text = $label;
+        $checkbox->label->text = $label;
+        $checkbox->alt = $alt;
+        return $checkbox;
+    }
 }
 
 /**