From 352d446d2d0ce4f2aa148c553ee886d6f7c025f4 Mon Sep 17 00:00:00 2001
From: lucha <lucha@paranoici.org>
Date: Mon, 31 Aug 2020 14:43:22 -0700
Subject: [PATCH] updated codebase
---
wp/PATCHES.txt | 4 ++++
wp/wp-includes/script-loader.php | 19 ++++++++++---------
2 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/wp/PATCHES.txt b/wp/PATCHES.txt
index f5dcd54..24d7dd6 100644
--- a/wp/PATCHES.txt
+++ b/wp/PATCHES.txt
@@ -29,3 +29,7 @@ Stop Wordpress from hardcoding the location of debug.log
Source: patches/core/0199-patch-stops-wordpress-from-hardcoding-the-location-o.patch
+Load JS library locally instead than from Googleapis
+Source: patches/core/0155-Removing-reference-to-googleapis-from-wp-includes-up.patch
+
+
diff --git a/wp/wp-includes/script-loader.php b/wp/wp-includes/script-loader.php
index 5725269..558032d 100644
--- a/wp/wp-includes/script-loader.php
+++ b/wp/wp-includes/script-loader.php
@@ -705,15 +705,16 @@ function wp_default_scripts( $scripts ) {
$scripts->add( 'wp-lists', "/wp-includes/js/wp-lists$suffix.js", array( 'wp-ajax-response', 'jquery-color' ), false, 1 );
// WordPress no longer uses or bundles Prototype or script.aculo.us. These are now pulled from an external source.
- $scripts->add( 'prototype', 'https://ajax.googleapis.com/ajax/libs/prototype/1.7.1.0/prototype.js', array(), '1.7.1' );
- $scripts->add( 'scriptaculous-root', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/scriptaculous.js', array( 'prototype' ), '1.9.0' );
- $scripts->add( 'scriptaculous-builder', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/builder.js', array( 'scriptaculous-root' ), '1.9.0' );
- $scripts->add( 'scriptaculous-dragdrop', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/dragdrop.js', array( 'scriptaculous-builder', 'scriptaculous-effects' ), '1.9.0' );
- $scripts->add( 'scriptaculous-effects', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/effects.js', array( 'scriptaculous-root' ), '1.9.0' );
- $scripts->add( 'scriptaculous-slider', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/slider.js', array( 'scriptaculous-effects' ), '1.9.0' );
- $scripts->add( 'scriptaculous-sound', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/sound.js', array( 'scriptaculous-root' ), '1.9.0' );
- $scripts->add( 'scriptaculous-controls', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/controls.js', array( 'scriptaculous-root' ), '1.9.0' );
- $scripts->add( 'scriptaculous', false, array( 'scriptaculous-dragdrop', 'scriptaculous-slider', 'scriptaculous-controls' ) );
+ // But A/I does!
+ $scripts->add( 'prototype', '/wp-includes/js/prototype-js-core/prototype.js', array(), '1.7.3');
+ $scripts->add( 'scriptaculous-root', '/wp-includes/js/scriptaculous-js/scriptaculous.js', array('prototype'), '1.9.0');
+ $scripts->add( 'scriptaculous-builder', '/wp-includes/js/scriptaculous-js/builder.js', array('scriptaculous-root'), '1.9.0');
+ $scripts->add( 'scriptaculous-dragdrop', '/wp-includes/js/scriptaculous-js/dragdrop.js', array('scriptaculous-builder', 'scriptaculous-effects'), '1.9.0');
+ $scripts->add( 'scriptaculous-effects', '/wp-includes/js/scriptaculous-js/effects.js', array('scriptaculous-root'), '1.9.0');
+ $scripts->add( 'scriptaculous-slider', '/wp-includes/js/scriptaculous-js/slider.js', array('scriptaculous-effects'), '1.9.0');
+ $scripts->add( 'scriptaculous-sound', '/wp-includes/js/scriptaculous-js/sound.js', array( 'scriptaculous-root' ), '1.9.0' );
+ $scripts->add( 'scriptaculous-controls', '/wp-includes/js/scriptaculous-js/controls.js', array('scriptaculous-root'), '1.9.0');
+ $scripts->add( 'scriptaculous', false, array('scriptaculous-dragdrop', 'scriptaculous-slider', 'scriptaculous-controls') );
// Not used in core, replaced by Jcrop.js.
$scripts->add( 'cropper', '/wp-includes/js/crop/cropper.js', array( 'scriptaculous-dragdrop' ) );
--
GitLab