Skip to content

Commit 3d8c291

Browse files
Pantheon Automationstovak
Pantheon Automation
authored andcommitted
Re-release of Drupal 7.79. For more information, see https://www.drupal.org/project/drupal/releases/7.79 and #168
1 parent faad4fc commit 3d8c291

File tree

4 files changed

+4
-24
lines changed

4 files changed

+4
-24
lines changed

includes/common.inc

+3-1
Original file line numberDiff line numberDiff line change
@@ -5183,7 +5183,9 @@ function drupal_build_js_cache($files) {
51835183

51845184
// Allow modules to act on the js_cache before writing to disk.
51855185
drupal_alter('js_cache', $contents);
5186-
5186+
5187+
// Remove JS source and source mapping urls or these may cause 404 errors.
5188+
$contents = preg_replace('/\/\/(#|@)\s(sourceURL|sourceMappingURL)=\s*(\S*?)\s*$/m', '', $contents);
51875189
// Prefix filename to prevent blocking by firewalls which reject files
51885190
// starting with "ad*".
51895191
$filename = 'js_' . drupal_hash_base64($contents) . '.js';

includes/common.inc.rej

-11
This file was deleted.

includes/menu.inc

+1-1
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ define('MENU_PREFERRED_LINK', '1cf698d64d1aa4b83907cf6ed55db3a7f8e92c91');
317317
* actually exists. This list of 'masks' is built in menu_rebuild().
318318
*
319319
* @param $parts
320-
* An array of path parts; for the above example,
320+
* An array of path parts; for the above example.
321321
* array('node', '12345', 'edit').
322322
*
323323
* @return

includes/menu.inc.rej

-11
This file was deleted.

0 commit comments

Comments
 (0)