diff --git a/core/core.services.yml b/core/core.services.yml index 7d9e831..8a61638 100644 --- a/core/core.services.yml +++ b/core/core.services.yml @@ -633,7 +633,7 @@ services: class: Drupal\Core\Asset\AssetDumper asset.js.collection_renderer: class: Drupal\Core\Asset\JsCollectionRenderer - arguments: [ '@state' ] + arguments: [ '@state', '@settings' ] asset.js.collection_optimizer: class: Drupal\Core\Asset\JsCollectionOptimizer arguments: [ '@asset.js.collection_grouper', '@asset.js.optimizer', '@asset.js.dumper', '@state' ] diff --git a/core/lib/Drupal/Core/Asset/JsCollectionRenderer.php b/core/lib/Drupal/Core/Asset/JsCollectionRenderer.php index e739d1c..b73129f 100644 --- a/core/lib/Drupal/Core/Asset/JsCollectionRenderer.php +++ b/core/lib/Drupal/Core/Asset/JsCollectionRenderer.php @@ -6,6 +6,7 @@ namespace Drupal\Core\Asset; +use Drupal\Component\Utility\Settings; use Drupal\Core\Asset\AssetCollectionRendererInterface; use Drupal\Core\KeyValueStore\KeyValueStoreInterface; @@ -21,14 +22,22 @@ class JsCollectionRenderer implements AssetCollectionRendererInterface { */ protected $state; + /** + * The settings array. + * + * @var \Drupal\Component\Utility\Settings + */ + protected $settings; + /** * Constructs a CssCollectionRenderer. * * @param \Drupal\Core\KeyValueStore\KeyValueStoreInterface * The state key/value store. */ - public function __construct(KeyValueStoreInterface $state) { + public function __construct(KeyValueStoreInterface $state, Settings $settings) { $this->state = $state; + $this->settings = $settings; } /** @@ -53,7 +62,7 @@ public function render(array $js_assets) { // Since JavaScript may look for arguments in the URL and act on them, some // third-party code might require the use of a different query string. - $js_version_string = variable_get('drupal_js_version_query_string', 'v='); + $js_version_string = $this->settings->get('drupal_js_version_query_string', 'v='); // Defaults for each SCRIPT element. $element_defaults = array(