From 0eb6d0832f471853a06a0f1f1973723959bcef7d Mon Sep 17 00:00:00 2001
From: Nathaniel Catchpole <catch@35733.no-reply.drupal.org>
Date: Tue, 3 Dec 2013 12:02:23 +0000
Subject: [PATCH] Issue #2096593 by Wim Leers: Remove drupal_add_css() from
system.module.
---
.../Controller/CommonTestController.php | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/core/modules/system/tests/modules/common_test/lib/Drupal/common_test/Controller/CommonTestController.php b/core/modules/system/tests/modules/common_test/lib/Drupal/common_test/Controller/CommonTestController.php
index d8429192934a..7b7afc42a595 100644
--- a/core/modules/system/tests/modules/common_test/lib/Drupal/common_test/Controller/CommonTestController.php
+++ b/core/modules/system/tests/modules/common_test/lib/Drupal/common_test/Controller/CommonTestController.php
@@ -82,11 +82,19 @@ public function drupalRenderInvalidKeys() {
* An empty string.
*/
public function jsAndCssQuerystring() {
- drupal_add_library('system', 'drupalSettings');
- drupal_add_js(drupal_get_path('module', 'node') . '/node.js');
- drupal_add_css(drupal_get_path('module', 'node') . '/css/node.admin.css');
- // A relative URI may have a query string.
- drupal_add_css('/' . drupal_get_path('module', 'node') . '/node-fake.css?arg1=value1&arg2=value2');
+ $attached = array(
+ '#attached' => array(
+ 'library' => array(
+ array('node', 'drupal.node'),
+ ),
+ 'css' => array(
+ drupal_get_path('module', 'node') . '/css/node.admin.css' => array(),
+ // A relative URI may have a query string.
+ '/' . drupal_get_path('module', 'node') . '/node-fake.css?arg1=value1&arg2=value2' => array(),
+ ),
+ ),
+ );
+ drupal_render($attached);
return '';
}
--
GitLab