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

Update to Drupal 8.0.1. For more information, see https://www.drupal.org/node/2627402

Browse source
This commit is contained in:
Pantheon Automation 2015-12-02 11:38:43 -08:00 • committed by Greg Anderson
parent 013aaaf2ff
commit 1a0e9d9fac
153 changed files with 1268 additions and 670 deletions
Download patch file Download diff file Expand all files Collapse all files

14
core/includes/theme.inc
View file

@ -407,7 +407,7 @@ function theme_render_and_autoescape($arg) {
$return = $arg->toString();
}
else {
throw new \Exception(t('Object of type "@class" cannot be printed.', array('@class' => get_class($arg))));
throw new \Exception('Object of type ' . get_class($arg) . ' cannot be printed.');
}
}
@ -445,22 +445,22 @@ function theme_settings_convert_to_config(array $theme_settings, Config $config)
if ($key == 'default_logo') {
$config->set('logo.use_default', $value);
}
else if ($key == 'logo_path') {
elseif ($key == 'logo_path') {
$config->set('logo.path', $value);
}
else if ($key == 'default_favicon') {
elseif ($key == 'default_favicon') {
$config->set('favicon.use_default', $value);
}
else if ($key == 'favicon_path') {
elseif ($key == 'favicon_path') {
$config->set('favicon.path', $value);
}
else if ($key == 'favicon_mimetype') {
elseif ($key == 'favicon_mimetype') {
$config->set('favicon.mimetype', $value);
}
else if (substr($key, 0, 7) == 'toggle_') {
elseif (substr($key, 0, 7) == 'toggle_') {
$config->set('features.' . Unicode::substr($key, 7), $value);
}
else if (!in_array($key, array('theme', 'logo_upload'))) {
elseif (!in_array($key, array('theme', 'logo_upload'))) {
$config->set($key, $value);
}
}