Skip to content
Snippets Groups Projects
Commit f01eb1bc authored by catch's avatar catch
Browse files

Revert "Issue #3471741 by mstrelan, bbrala, kristiaanvandeneynde: Fix null...

Revert "Issue #3471741 by mstrelan, bbrala, kristiaanvandeneynde: Fix null $cid in CacheCollector classes"

This reverts commit 39041950.
parent 3eee8f1d
No related branches found
No related tags found
10 merge requests!10602Issue #3438769 by vinmayiswamy, antonnavi, michelle, amateescu: Sub workspace does not clear,!10301Issue #3469309 by mstrelan, smustgrave, moshe weitzman: Use one-time login...,!10187Issue #3487488 by dakwamine: ExtensionMimeTypeGuesser::guessMimeType must support file names with "0" (zero) like foo.0.zip,!9929Issue #3445469 by pooja_sharma, smustgrave: Add additional test coverage for...,!9787Resolve issue 3479427 - bootstrap barrio issue under Windows,!9742Issue #3463908 by catch, quietone: Split OptionsFieldUiTest into two,!9526Issue #3458177 by mondrake, catch, quietone, godotislate, longwave, larowlan,...,!6502Draft: Resolve #2938524 "Plach testing issue",!38582585169-10.1.x,!3226Issue #2987537: Custom menu link entity type should not declare "bundle" entity key
Pipeline #280855 passed with warnings
Pipeline: drupal

#280886

    Pipeline: drupal

    #280875

      Pipeline: drupal

      #280874

        +4
        ......@@ -43,7 +43,7 @@ class LibraryDiscoveryCollector extends CacheCollector {
        */
        public function __construct(CacheBackendInterface $cache, LockBackendInterface $lock, LibraryDiscoveryParser $discovery_parser, ThemeManagerInterface $theme_manager) {
        $this->themeManager = $theme_manager;
        parent::__construct('', $cache, $lock, ['library_info']);
        parent::__construct(NULL, $cache, $lock, ['library_info']);
        $this->discoveryParser = $discovery_parser;
        }
        ......@@ -52,7 +52,7 @@ public function __construct(CacheBackendInterface $cache, LockBackendInterface $
        * {@inheritdoc}
        */
        protected function getCid() {
        if ($this->cid === '') {
        if (!isset($this->cid)) {
        $this->cid = 'library_info:' . $this->themeManager->getActiveTheme()->getName();
        }
        ......@@ -164,7 +164,7 @@ protected function applyLibrariesExtend($extension, $library_name, $library_defi
        */
        public function reset() {
        parent::reset();
        $this->cid = '';
        $this->cid = NULL;
        }
        }
        ......@@ -42,7 +42,7 @@ class MenuActiveTrail extends CacheCollector implements MenuActiveTrailInterface
        * The lock backend.
        */
        public function __construct(MenuLinkManagerInterface $menu_link_manager, RouteMatchInterface $route_match, CacheBackendInterface $cache, LockBackendInterface $lock) {
        parent::__construct('', $cache, $lock);
        parent::__construct(NULL, $cache, $lock);
        $this->menuLinkManager = $menu_link_manager;
        $this->routeMatch = $route_match;
        }
        ......@@ -53,7 +53,7 @@ public function __construct(MenuLinkManagerInterface $menu_link_manager, RouteMa
        * @see ::getActiveTrailIds()
        */
        protected function getCid() {
        if ($this->cid === '') {
        if (!isset($this->cid)) {
        $route_parameters = $this->routeMatch->getRawParameters()->all();
        ksort($route_parameters);
        $this->cid = 'active-trail:route:' . $this->routeMatch->getRouteName() . ':route_parameters:' . serialize($route_parameters);
        ......
        0% Loading or .
        You are about to add 0 people to the discussion. Proceed with caution.
        Please register or to comment