diff --git "a/C:\\Documents and Settings\\kcraft\\Desktop\\Patches\\core-js-IE-addimport-1071818-55 (1).patch" "b/C:\\Documents and Settings\\kcraft\\Desktop\\Patches\\core-js-IE-addimport-1071818-75.patch" index af16b6e..41b86a8 100644 --- "a/C:\\Documents and Settings\\kcraft\\Desktop\\Patches\\core-js-IE-addimport-1071818-55 (1).patch" +++ "b/C:\\Documents and Settings\\kcraft\\Desktop\\Patches\\core-js-IE-addimport-1071818-75.patch" @@ -39,20 +39,24 @@ index 8817356..3d17d64 100644 + ); +} diff --git a/core/includes/common.inc b/core/includes/common.inc -index 757a0c6..deecd9e 100644 +index 5ff6167..4d483b5 100644 --- a/core/includes/common.inc +++ b/core/includes/common.inc -@@ -3347,7 +3347,7 @@ function drupal_pre_render_styles($elements) { +@@ -3425,7 +3425,11 @@ function drupal_pre_render_styles($elements) { $import_batch = array_slice($import, 0, 31); $import = array_slice($import, 31); $element = $style_element_defaults; - $element['#value'] = implode("\n", $import_batch); ++ // This simplifies the JavaScript regex, allowing each line ++ // (separated by \n) to be treated as a completely different string. ++ // This means that we can use ^ and $ on one line at a time, and not ++ // worry about style tags since they'll never match the regex. + $element['#value'] = "\n" . implode("\n", $import_batch) . "\n"; $element['#attributes']['media'] = $group['media']; $element['#browsers'] = $group['browsers']; $elements[] = $element; diff --git a/core/misc/ajax.js b/core/misc/ajax.js -index 652b8e2..2a3ee96 100644 +index bd17811..a675cdd 100644 --- a/core/misc/ajax.js +++ b/core/misc/ajax.js @@ -616,6 +616,25 @@ Drupal.ajax.prototype.commands = {