damiankloip

diff --git a/core/core.services.yml b/core/core.services.yml
index 7abab67..2867596 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -100,6 +100,11 @@ services:
     factory_method: get
     factory_service: cache_factory
     arguments: [discovery]
+  cache.plugin_collector:
+    class: Drupal\Core\Cache\CacheCollectorBackend

damiankloip

<?php

/**
 * @file
 * Contains \Drupal\Tests\Core\DependencyInjection\Compiler\StackedKernelPassTest.
 */

namespace Drupal\Tests\Core\DependencyInjection\Compiler;

use Drupal\Core\DependencyInjection\Compiler\StackedKernelPass;

damiankloip

diff --git a/core/lib/Drupal/Core/Cache/CacheCollectorBackend.php b/core/lib/Drupal/Core/Cache/CacheCollectorBackend.php
new file mode 100644
index 0000000..b5b9b40
--- /dev/null
+++ b/core/lib/Drupal/Core/Cache/CacheCollectorBackend.php
@@ -0,0 +1,398 @@
+<?php
+
+/**
+ * @file

damiankloip

<?php

/**
 * @file
 * Contains \Drupal\Core\Cache\CacheCollectorBackend.
 */

namespace Drupal\Core\Cache;

use Drupal\Core\DestructableInterface;

damiankloip

<?php

/**
 * @file
 * Contains \Drupal\Core\Plugin\PluginDiscoveryFactoryInterface.
 */

namespace Drupal\Core\Plugin;

/**

damiankloip

diff --git a/core/modules/views/src/Plugin/views/style/Rss.php b/core/modules/views/src/Plugin/views/style/Rss.php
index 788e13a..c8277f8 100644
--- a/core/modules/views/src/Plugin/views/style/Rss.php
+++ b/core/modules/views/src/Plugin/views/style/Rss.php
@@ -44,7 +44,8 @@ public function attachTo($display_id, $path, $title) {
     $url = url($this->view->getUrl(NULL, $path), $url_options);
     if ($display->hasPath()) {
       if (empty($this->preview)) {
-        drupal_add_feed($url, $title);
+        // Add a call for drupal_add_feed to the view attached data.

damiankloip

diff --git a/core/lib/Drupal/Core/Entity/Entity.php b/core/lib/Drupal/Core/Entity/Entity.php
index cf18d55..0b47db2 100644
--- a/core/lib/Drupal/Core/Entity/Entity.php
+++ b/core/lib/Drupal/Core/Entity/Entity.php
@@ -135,7 +135,14 @@ public function bundle() {
   public function label() {
     $label = NULL;
     $entity_type = $this->getEntityType();
-    if (($label_callback = $entity_type->getLabelCallback()) && is_callable($label_callback)) {
+    $label_callback = $entity_type->getLabelCallback();

damiankloip

diff --git a/core/modules/views/src/ViewExecutable.php b/core/modules/views/src/ViewExecutable.php
index d6b4775..56e6284 100644
--- a/core/modules/views/src/ViewExecutable.php
+++ b/core/modules/views/src/ViewExecutable.php
@@ -9,6 +9,7 @@
 
 use Drupal\Core\DependencyInjection\DependencySerialization;
 use Drupal\Core\Session\AccountInterface;
+use Drupal\Core\Site\Settings;
 use Drupal\views\Plugin\views\query\QueryPluginBase;

damiankloip

/**
 * Enable access to rebuild.php.
 *
 * This setting can be enabled to allow Drupal's php and database cached
 * storage to be cleared via the rebuild.php page. Access to this page can also
 * be gained by generating a query string from rebuild_token_calculator.sh and
 * using these parameters in a request to rebuild.php.
 */
# $settings['rebuild_access'] = TRUE;

damiankloip

diff --git a/core/core.services.yml b/core/core.services.yml
index 19b0b72..ddba8e8 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -795,7 +795,9 @@ services:
     class: Drupal\Core\Asset\AssetDumper
   library.discovery:
     class: Drupal\Core\Asset\LibraryDiscovery
-    arguments: ['@cache.discovery', '@module_handler']
+    arguments: ['@cache.discovery', '@module_handler', '@lock']