Commit 65c671ef authored by webchick's avatar webchick

Revert "git commit -m Issue"

How about a *sensible* commit message? ;)

This reverts commit 1a10539f.
parent 1a10539f
......@@ -2223,14 +2223,10 @@ function template_preprocess_field_multiple_value_form(&$variables) {
if ($variables['multiple']) {
$table_id = drupal_html_id($element['#field_name'] . '_values');
$order_class = $element['#field_name'] . '-delta-order';
$header_attributes = new Attribute(array('class' => array('label')));
if (!empty($element['#required'])) {
$header_attributes['class'][] = 'form-required';
}
$header = array(
array(
'data' => array(
'#prefix' => '<h4' . $header_attributes . '>',
'#prefix' => '<h4 class="label">',
'title' => array(
'#markup' => t($element['#title']),
),
......@@ -2241,6 +2237,12 @@ function template_preprocess_field_multiple_value_form(&$variables) {
),
t('Order', array(), array('context' => 'Sort order')),
);
if (!empty($element['#required'])) {
$header[0]['data']['required'] = array(
'#theme' => 'form_required_marker',
'#element' => $element,
);
}
$rows = array();
// Sort items according to '_weight' (needed when the form comes back after
......
......@@ -16,17 +16,6 @@
*/
class BlockContentViewBuilder extends EntityViewBuilder {
/**
* {@inheritdoc}
*/
protected function getBuildDefaults(EntityInterface $entity, $view_mode, $langcode) {
$build = parent::getBuildDefaults($entity, $view_mode, $langcode);
// The custom block will be rendered in the wrapped block template already
// and thus has no entity template itself.
unset($build['#theme']);
return $build;
}
/**
* {@inheritdoc}
*/
......
......@@ -17,17 +17,6 @@
*/
class MessageViewBuilder extends EntityViewBuilder {
/**
* {@inheritdoc}
*/
protected function getBuildDefaults(EntityInterface $entity, $view_mode, $langcode) {
$build = parent::getBuildDefaults($entity, $view_mode, $langcode);
// The message fields are individually rendered into email templates, so
// the entity has no template itself.
unset($build['#theme']);
return $build;
}
/**
* {@inheritdoc}
*/
......
......@@ -64,6 +64,7 @@ function testItemList() {
// Verify that title set to a render array is output.
$variables = array();
$variables['title'] = array(
'#theme' => 'markup',
'#markup' => '<span>Render array</span>',
);
$variables['empty'] = 'No items found.';
......
......@@ -8,7 +8,6 @@
namespace Drupal\entity_test;
use Drupal\Component\Utility\String;
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Entity\EntityViewBuilder;
/**
......@@ -18,15 +17,6 @@
*/
class EntityTestViewBuilder extends EntityViewBuilder {
/**
* {@inheritdoc}
*/
protected function getBuildDefaults(EntityInterface $entity, $view_mode, $langcode) {
$build = parent::getBuildDefaults($entity, $view_mode, $langcode);
unset($build['#theme']);
return $build;
}
/**
* {@inheritdoc}
*/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment