projects
/
yaffs-website
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Patched to Drupal 8.4.8 level. See https://www.drupal.org/sa-core-2018-004 and patch...
[yaffs-website]
/
web
/
core
/
lib
/
Drupal
/
Core
/
Extension
/
ThemeHandler.php
diff --git
a/web/core/lib/Drupal/Core/Extension/ThemeHandler.php
b/web/core/lib/Drupal/Core/Extension/ThemeHandler.php
index 2fd75e190cabdf6259aa169841da84332e9c71a8..d54ff1fa1a1453cf4dc554c7cb33b9d43322d53e 100644
(file)
--- a/
web/core/lib/Drupal/Core/Extension/ThemeHandler.php
+++ b/
web/core/lib/Drupal/Core/Extension/ThemeHandler.php
@@
-216,10
+216,16
@@
class ThemeHandler implements ThemeHandlerInterface {
* {@inheritdoc}
*/
public function refreshInfo() {
* {@inheritdoc}
*/
public function refreshInfo() {
- $this->reset();
$extension_config = $this->configFactory->get('core.extension');
$installed = $extension_config->get('theme');
$extension_config = $this->configFactory->get('core.extension');
$installed = $extension_config->get('theme');
+ // Only refresh the info if a theme has been installed. Modules are
+ // installed before themes by the installer and this method is called during
+ // module installation.
+ if (empty($installed) && empty($this->list)) {
+ return;
+ }
+ $this->reset();
// @todo Avoid re-scanning all themes by retaining the original (unaltered)
// theme info somewhere.
$list = $this->rebuildThemeData();
// @todo Avoid re-scanning all themes by retaining the original (unaltered)
// theme info somewhere.
$list = $this->rebuildThemeData();