#582584 by dww, Jacine, and chx: Move required form element marker into its own theme function.

2 files changed, 25 insertions, 1 deletions

diff --git a/includes/common.inc b/includes/common.inc
index ce76725cf..fc1e71d29 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -5321,6 +5321,9 @@ function drupal_common_theme() {
     'form_element' => array(
       'render element' => 'element',
     ),
+    'form_required_marker' => array(
+      'arguments' => array('element' => NULL),
+    ),
     'text_format_wrapper' => array(
       'render element' => 'element',
     ),
diff --git a/includes/form.inc b/includes/form.inc
index 06ab7e0a6..5e3895aaa 100644
--- a/includes/form.inc
+++ b/includes/form.inc
@@ -2774,7 +2774,7 @@ function theme_form_element($variables) {
   }
 
   $output = '<div class="' . implode(' ', $class) . '">' . "\n";
-  $required = !empty($element['#required']) ? '<span class="form-required" title="' . $t('This field is required.') . '">*</span>' : '';
+  $required = !empty($element['#required']) ? theme('form_required_marker', array('element' => $element)) : '';
 
   if (!empty($element['#title']) && empty($element['#form_element_skip_title'])) {
     $title = $element['#title'];
@@ -2798,6 +2798,27 @@ function theme_form_element($variables) {
 }
 
 /**
+ * Theme the marker for required form elements.
+ *
+ * @param $variables
+ *   An associative array containing:
+ *   - element: An associative array containing the properties of the element.
+ * @return
+ *   A string representing the marker to identify required form elements.
+ *
+ * @ingroup themeable
+ */
+function theme_form_required_marker($variables) {
+  // This is also used in the installer, pre-database setup.
+  $t = get_t();
+  $attributes = array(
+    'class' => 'form-required',
+    'title' => $t('This field is required.'),
+  );
+  return '<span' . drupal_attributes($attributes) . '>*</span>';
+}
+
+/**
  * Sets a form element's class attribute.
  *
  * Adds 'required' and 'error' classes as needed.