Re-release of Drupal 7.79. For more information, see https://www.drup…

…al.org/project/drupal/releases/7.79 and #168
pantheon-systems · Apr 8, 2021 · 3d8c291 · 3d8c291
1 parent faad4fc
commit 3d8c291
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 24 deletions.
diff --git a/includes/common.inc b/includes/common.inc
@@ -5183,7 +5183,9 @@ function drupal_build_js_cache($files) {
 
     // Allow modules to act on the js_cache before writing to disk.
     drupal_alter('js_cache', $contents);
-
+
+    // Remove JS source and source mapping urls or these may cause 404 errors.
+    $contents = preg_replace('/\/\/(#|@)\s(sourceURL|sourceMappingURL)=\s*(\S*?)\s*$/m', '', $contents);
     // Prefix filename to prevent blocking by firewalls which reject files
     // starting with "ad*".
     $filename = 'js_' . drupal_hash_base64($contents) . '.js';

diff --git a/includes/common.inc.rej b/includes/common.inc.rej
diff --git a/includes/menu.inc b/includes/menu.inc
@@ -317,7 +317,7 @@ define('MENU_PREFERRED_LINK', '1cf698d64d1aa4b83907cf6ed55db3a7f8e92c91');
  * actually exists. This list of 'masks' is built in menu_rebuild().
  *
  * @param $parts
- *   An array of path parts; for the above example, 
+ *   An array of path parts; for the above example.
  *   array('node', '12345', 'edit').
  *
  * @return

diff --git a/includes/menu.inc.rej b/includes/menu.inc.rej