opdavies/drupalcampbristol
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to Drupal 8.2.2. For more information, see https://www.drupal.org/project/drupal/releases/8.2.2

Browse source
This commit is contained in:
Pantheon Automation 2016-11-02 11:43:31 -07:00 • committed by Greg Anderson
parent 23ffed3665
commit 507b45a0ed
378 changed files with 11434 additions and 5542 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/lib/Drupal/Core/Render/Element/Link.php
View file

@ -92,7 +92,7 @@ class Link extends RenderElement {
/** @var \Drupal\Core\Utility\LinkGenerator $link_generator */
$link_generator = \Drupal::service('link_generator');
$generated_link = $link_generator->generate($element['#title'], $element['#url']->setOptions($options));
$element['#markup'] = $generated_link->getGeneratedLink();
$element['#markup'] = $generated_link;
$generated_link->merge(BubbleableMetadata::createFromRenderArray($element))
->applyTo($element);
}

8
core/lib/Drupal/Core/Render/Element/Table.php
View file

@ -33,7 +33,8 @@ use Drupal\Component\Utility\Html as HtmlUtility;
* '#header' => array($this->t('Name'), $this->t('Phone')),
* );
*
* for ($i=1; $i<=4; $i++) {
* for ($i = 1; $i <= 4; $i++) {
* $form['contacts'][$i]['#attributes'] = array('class' => array('foo', 'baz'));
* $form['contacts'][$i]['name'] = array(
* '#type' => 'textfield',
* '#title' => $this->t('Name'),
@ -46,6 +47,11 @@ use Drupal\Component\Utility\Html as HtmlUtility;
* '#title_display' => 'invisible',
* );
* }
*
* $form['contacts'][]['colspan_example'] = array(
* '#plain_text' => 'Colspan Example',
* '#wrapper_attributes' => array('colspan' => 2, 'class' => array('foo', 'bar')),
* );
* @endcode
* @see \Drupal\Core\Render\Element\Tableselect
*