From 959fa9daa5d642e1b2570d8f8d7ad43ebbb5310b Mon Sep 17 00:00:00 2001
From: webchick <webchick@24967.no-reply.drupal.org>
Date: Mon, 7 Apr 2014 09:31:14 -0700
Subject: [PATCH] Revert "Issue #2160365 by plopesc, vijaycs85: Date field
 required marker rendered as "Array"."

Broke HEAD.

This reverts commit 0f0edea2a3e20b3f91047fde55530158b31575d6.
---
 core/modules/datetime/datetime.module                | 12 +++++++-----
 .../lib/Drupal/datetime/Tests/DateTimeFieldTest.php  |  2 --
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/modules/datetime/datetime.module b/core/modules/datetime/datetime.module
index c8dd4d1b036..3a016b55802 100644
--- a/core/modules/datetime/datetime.module
+++ b/core/modules/datetime/datetime.module
@@ -227,11 +227,13 @@ function template_preprocess_datetime_wrapper(&$variables) {
   $element = $variables['element'];
 
   // If the element is required, a required marker is appended to the label.
-  $form_required_marker = array(
-    '#theme' => 'form_required_marker',
-    '#element' => $element,
-  );
-  $variables['required'] = !empty($element['#required']) ? drupal_render($form_required_marker) : '';
+  $variables['required'] = NULL;
+  if(!empty($element['#required'])) {
+    $variables['required'] = array(
+      '#theme' => 'form_required_marker',
+      '#element' => $element,
+    );
+  }
 
   if (!empty($element['#title'])) {
     $variables['title'] = $element['#title'];
diff --git a/core/modules/datetime/lib/Drupal/datetime/Tests/DateTimeFieldTest.php b/core/modules/datetime/lib/Drupal/datetime/Tests/DateTimeFieldTest.php
index ec62ca3dcfb..76b4cb962f2 100644
--- a/core/modules/datetime/lib/Drupal/datetime/Tests/DateTimeFieldTest.php
+++ b/core/modules/datetime/lib/Drupal/datetime/Tests/DateTimeFieldTest.php
@@ -69,7 +69,6 @@ class DateTimeFieldTest extends WebTestBase {
       'field_name' => $this->field->name,
       'entity_type' => 'entity_test',
       'bundle' => 'entity_test',
-      'required' => TRUE,
     ));
     $this->instance->save();
 
@@ -98,7 +97,6 @@ class DateTimeFieldTest extends WebTestBase {
     // Display creation form.
     $this->drupalGet('entity_test/add');
     $this->assertFieldByName("{$field_name}[0][value][date]", '', 'Date element found.');
-    $this->assertFieldByXPath('//*[@id="' . $field_name . '-add-more-wrapper"]/h4/span', '*', 'Required markup found');
     $this->assertNoFieldByName("{$field_name}[0][value][time]", '', 'Time element not found.');
 
     // Submit a valid date and ensure it is accepted.