From 3d8c29115c27d5910dfe8ea82a6ed830cc94c571 Mon Sep 17 00:00:00 2001
From: Pantheon Automation <bot@getpantheon.com>
Date: Thu, 8 Apr 2021 10:57:43 -0700
Subject: [PATCH] Re-release of Drupal 7.79. For more information, see
 https://www.drupal.org/project/drupal/releases/7.79 and
 https://github.com/pantheon-systems/drops-7/issues/168

---
 includes/common.inc     |  4 +++-
 includes/common.inc.rej | 11 -----------
 includes/menu.inc       |  2 +-
 includes/menu.inc.rej   | 11 -----------
 4 files changed, 4 insertions(+), 24 deletions(-)
 delete mode 100644 includes/common.inc.rej
 delete mode 100644 includes/menu.inc.rej

diff --git a/includes/common.inc b/includes/common.inc
index 89db3c0f91..88dc7a8bcd 100644
--- 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
deleted file mode 100644
index 72993b00aa..0000000000
--- a/includes/common.inc.rej
+++ /dev/null
@@ -1,11 +0,0 @@
---- includes/common.inc
-+++ includes/common.inc
-@@ -5167,6 +5168,8 @@ function drupal_build_js_cache($files) {
-         $contents .= file_get_contents($path) . ";\n";
-       }
-     }
-+    // 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/menu.inc b/includes/menu.inc
index 9a1b8df66b..fb99aac8a2 100644
--- 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
deleted file mode 100644
index ecf23fb0ea..0000000000
--- a/includes/menu.inc.rej
+++ /dev/null
@@ -1,11 +0,0 @@
---- includes/menu.inc
-+++ 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