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

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

Browse source
This commit is contained in:
Pantheon Automation 2016-10-06 15:16:20 -07:00 • committed by Greg Anderson
parent 2f563ab520
commit f1c8716f57
1732 changed files with 52334 additions and 11780 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/lib/Drupal/Core/Utility/Error.php
View file

@ -71,7 +71,7 @@ class Error {
'%line' => $caller['line'],
'severity_level' => static::ERROR,
'backtrace' => $backtrace,
'backtrace_string' => $exception->getTraceAsString(),
'@backtrace_string' => $exception->getTraceAsString(),
);
}

9
core/lib/Drupal/Core/Utility/LinkGenerator.php
View file

@ -7,6 +7,7 @@ use Drupal\Component\Utility\Html;
use Drupal\Component\Render\MarkupInterface;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\Core\GeneratedLink;
use Drupal\Core\GeneratedNoLink;
use Drupal\Core\Link;
use Drupal\Core\Render\RendererInterface;
use Drupal\Core\Routing\UrlGeneratorInterface;
@ -143,7 +144,7 @@ class LinkGenerator implements LinkGeneratorInterface {
$url = $variables['url'];
// Move attributes out of options since generateFromRoute() doesn't need
// them. Include a placeholder for the href.
// them. Make sure the "href" comes first for testing purposes.
$attributes = array('href' => '') + $variables['options']['attributes'];
unset($variables['options']['attributes']);
$url->setOptions($variables['options']);
@ -153,6 +154,10 @@ class LinkGenerator implements LinkGeneratorInterface {
$generated_link = new GeneratedLink();
$attributes['href'] = $url->toString(FALSE);
}
elseif ($url->isRouted() && $url->getRouteName() === '<nolink>') {
$generated_link = new GeneratedNoLink();
unset($attributes['href']);
}
else {
$generated_url = $url->toString(TRUE);
$generated_link = GeneratedLink::createFromObject($generated_url);
@ -167,7 +172,7 @@ class LinkGenerator implements LinkGeneratorInterface {
$attributes = new Attribute($attributes);
// This is safe because Attribute does escaping and $variables['text'] is
// either rendered or escaped.
return $generated_link->setGeneratedLink('<a' . $attributes . '>' . $variables['text'] . '</a>');
return $generated_link->setGeneratedLink('<' . $generated_link::TAG . $attributes . '>' . $variables['text'] . '</' . $generated_link::TAG . '>');
}
}

2
core/lib/Drupal/Core/Utility/ThemeRegistry.php
View file

@ -53,7 +53,7 @@ class ThemeRegistry extends CacheCollector implements DestructableInterface {
$this->tags = $tags;
$this->persistable = $modules_loaded && \Drupal::hasRequest() && \Drupal::request()->isMethod('GET');
// @todo: Implement lazyload.
// @todo: Implement lazyload.
$this->cacheLoaded = TRUE;
if ($this->persistable && $cached = $this->cache->get($this->cid)) {