diff --git a/core/lib/Drupal/Core/Asset/CssCollectionOptimizerLazy.php b/core/lib/Drupal/Core/Asset/CssCollectionOptimizerLazy.php index 19ac573..28a2857 100644 --- a/core/lib/Drupal/Core/Asset/CssCollectionOptimizerLazy.php +++ b/core/lib/Drupal/Core/Asset/CssCollectionOptimizerLazy.php @@ -124,8 +124,8 @@ public function optimize(array $css_assets) { $already_loaded = isset($ajax_page_state) ? explode(',', $ajax_page_state['libraries']) : []; $query_args = [ 'theme' => $this->themeManager->getActiveTheme()->getName(), - 'libraries' => $this->dependencyResolver->getMinimalRepresentativeSubset($libraries), - 'already_loaded' => $this->dependencyResolver->getMinimalRepresentativeSubset($already_loaded), + 'include' => implode(',', $this->dependencyResolver->getMinimalRepresentativeSubset($libraries)), + 'exclude' => implode(',', $this->dependencyResolver->getMinimalRepresentativeSubset($already_loaded)), ]; $query = UrlHelper::buildQuery($query_args); foreach ($css_assets as $order => $css_asset) { diff --git a/core/lib/Drupal/Core/Asset/JsCollectionOptimizerLazy.php b/core/lib/Drupal/Core/Asset/JsCollectionOptimizerLazy.php index 1082970..016661b 100644 --- a/core/lib/Drupal/Core/Asset/JsCollectionOptimizerLazy.php +++ b/core/lib/Drupal/Core/Asset/JsCollectionOptimizerLazy.php @@ -125,13 +125,13 @@ public function optimize(array $js_assets) { if ($libraries) { // Generate a URL for the group, but do not process it inline, this is // done by \Drupal\system\controller\JsAssetController - $ajax_page_state = $this->requestStack->getCurrentRequest()->query->get('ajax_page_state'); + $ajax_page_state = $this->requestStack->getCurrentRequest()->get('ajax_page_state'); $already_loaded = isset($ajax_page_state) ? explode(',', $ajax_page_state['libraries']) : []; $query_args = [ - 'libraries' => $this->dependencyResolver->getMinimalRepresentativeSubset($libraries), + 'include' => implode(',', $this->dependencyResolver->getMinimalRepresentativeSubset($libraries)), 'theme' => $this->themeManager->getActiveTheme()->getName(), - 'already_loaded' => $this->dependencyResolver->getMinimalRepresentativeSubset($already_loaded), + 'exclude' => implode(',', $this->dependencyResolver->getMinimalRepresentativeSubset($already_loaded)), ]; $header_query = UrlHelper::buildQuery($query_args + ['scope' => 'header']); $footer_query = UrlHelper::buildQuery($query_args + ['scope' => 'footer']); diff --git a/core/modules/system/src/Controller/AssetControllerBase.php b/core/modules/system/src/Controller/AssetControllerBase.php index d56c59e..115c7ab 100644 --- a/core/modules/system/src/Controller/AssetControllerBase.php +++ b/core/modules/system/src/Controller/AssetControllerBase.php @@ -187,9 +187,9 @@ public function deliver(Request $request, $file_name) { $this->themeManager->setActiveTheme($active_theme); $attached_assets = new AttachedAssets(); - $attached_assets->setLibraries($request->query->get('libraries')); - if ($request->query->has('already_loaded')) { - $attached_assets->setAlreadyLoadedLibraries($request->query->get('already_loaded')); + $attached_assets->setLibraries(explode(',', $request->query->get('include'))); + if ($request->query->has('exclude')) { + $attached_assets->setAlreadyLoadedLibraries(explode(',', $request->query->get('exclude'))); } $groups = $this->getGroups($attached_assets, $request);