From 7b31eb877f8aa7aaac4d3220d2d611dc82dd0acc Mon Sep 17 00:00:00 2001
From: Michael D Adams
Date: Thu, 22 Aug 2019 23:30:25 -0700
Subject: [PATCH 1/6] Use HTTPS links in comments where we can and it makes
sense.
---
_inc/lib/class.color.php | 18 +++++++++---------
_inc/lib/class.jetpack-password-checker.php | 2 +-
_inc/lib/icalendar-reader.php | 2 +-
_inc/lib/tonesque.php | 6 +++---
class.json-api.php | 4 ++--
class.photon.php | 2 +-
functions.compat.php | 2 +-
functions.opengraph.php | 8 ++++----
functions.photon.php | 6 +++---
...ass.wpcom-json-api-update-post-endpoint.php | 2 +-
...pcom-json-api-update-post-v1-1-endpoint.php | 2 +-
...pcom-json-api-update-post-v1-2-endpoint.php | 2 +-
load-jetpack.php | 4 ++--
modules/contact-form/admin.php | 2 +-
modules/contact-form/grunion-contact-form.php | 6 +++---
modules/contact-form/grunion-editor-view.php | 2 +-
modules/custom-css/csstidy/class.csstidy.php | 6 +++---
.../custom-css/csstidy/class.csstidy_ctype.php | 4 ++--
.../csstidy/class.csstidy_optimise.php | 4 ++--
.../custom-css/csstidy/class.csstidy_print.php | 4 ++--
modules/custom-css/csstidy/data.inc.php | 2 +-
modules/custom-css/csstidy/lang.inc.php | 4 ++--
modules/custom-css/custom-css.php | 2 +-
.../custom-css/preprocessors/lessc.inc.php | 6 +++---
.../custom-css/preprocessors/scss.inc.php | 8 ++++----
modules/custom-post-types/comics.php | 4 ++--
modules/custom-post-types/nova.php | 2 +-
modules/custom-post-types/portfolios.php | 2 +-
modules/custom-post-types/testimonial.php | 2 +-
.../google-analytics/wp-google-analytics.php | 2 +-
modules/infinite-scroll/infinity.php | 6 +++---
modules/markdown/easy-markdown.php | 6 +++---
modules/minileven/minileven.php | 2 +-
.../minileven/theme/pub/minileven/index.php | 2 +-
modules/sharedaddy/sharedaddy.php | 4 ++--
modules/shortcodes/archiveorg-book.php | 4 ++--
modules/shortcodes/brightcove.php | 2 +-
modules/sitemaps/sitemap-builder.php | 12 ++++++------
modules/sitemaps/sitemap-constants.php | 4 ++--
modules/sitemaps/sitemap-stylist.php | 2 +-
modules/sitemaps/sitemaps.php | 6 +++---
modules/theme-tools/compat/twentyfifteen.php | 2 +-
modules/theme-tools/compat/twentynineteen.php | 2 +-
modules/theme-tools/compat/twentyseventeen.php | 2 +-
modules/theme-tools/compat/twentysixteen.php | 2 +-
modules/theme-tools/featured-content.php | 2 +-
modules/theme-tools/random-redirect.php | 4 ++--
modules/theme-tools/site-logo.php | 2 +-
modules/videopress/class.videopress-player.php | 16 ++++++++--------
modules/videopress/shortcode.php | 2 +-
modules/videopress/utility-functions.php | 2 +-
modules/widgets/gallery.php | 2 +-
modules/widgets/google-translate.php | 4 ++--
modules/widgets/gravatar-profile.php | 2 +-
modules/widgets/milestone/milestone.php | 4 ++--
modules/widgets/wordpress-post-widget.php | 2 +-
sal/class.json-api-site-jetpack.php | 2 +-
tools/export-translations.php | 2 +-
58 files changed, 113 insertions(+), 113 deletions(-)
diff --git a/_inc/lib/class.color.php b/_inc/lib/class.color.php
index a57f2009c6a31..e145298c05d97 100644
--- a/_inc/lib/class.color.php
+++ b/_inc/lib/class.color.php
@@ -9,7 +9,7 @@
*
* @author Harold Asbridge
* @author Matt Wiebe
- * @license http://www.opensource.org/licenses/MIT
+ * @license https://www.opensource.org/licenses/MIT
*/
class Jetpack_Color {
@@ -125,7 +125,7 @@ public function fromRgbHex($red, $green, $blue)
/**
* Converts an HSL color value to RGB. Conversion formula
- * adapted from http://en.wikipedia.org/wiki/HSL_color_space.
+ * adapted from https://en.wikipedia.org/wiki/HSL_color_space.
* @param int $h Hue. [0-360]
* @param in $s Saturation [0, 100]
* @param int $l Lightness [0, 100]
@@ -321,13 +321,13 @@ public function toHsvInt()
}
/**
- * Converts an RGB color value to HSL. Conversion formula
- * adapted from http://en.wikipedia.org/wiki/HSL_color_space.
- * Assumes r, g, and b are contained in the set [0, 255] and
- * returns h in [0, 360], s in [0, 100], l in [0, 100]
- *
- * @return Array The HSL representation
- */
+ * Converts an RGB color value to HSL. Conversion formula
+ * adapted from https://en.wikipedia.org/wiki/HSL_color_space.
+ * Assumes r, g, and b are contained in the set [0, 255] and
+ * returns h in [0, 360], s in [0, 100], l in [0, 100]
+ *
+ * @return Array The HSL representation
+ */
public function toHsl() {
list( $r, $g, $b ) = array_values( $this->toRgbInt() );
$r /= 255; $g /= 255; $b /= 255;
diff --git a/_inc/lib/class.jetpack-password-checker.php b/_inc/lib/class.jetpack-password-checker.php
index 14de6053759f9..01b9c61c7d7a6 100644
--- a/_inc/lib/class.jetpack-password-checker.php
+++ b/_inc/lib/class.jetpack-password-checker.php
@@ -518,7 +518,7 @@ protected function get_char_index( $char ) {
* L = String length (the for iterator)
* N = Our charset size, via get_charset_size()
*
- * @see http://en.wikipedia.org/wiki/Password_strength#Random_passwords
+ * @see https://en.wikipedia.org/wiki/Password_strength#Random_passwords
*
* On top of the base formula, we're also multiplying the bits of entropy for every char
* by 1 - (the probabily of it following the previous char)
diff --git a/_inc/lib/icalendar-reader.php b/_inc/lib/icalendar-reader.php
index f7e047f9812cc..306f9fffcaef6 100644
--- a/_inc/lib/icalendar-reader.php
+++ b/_inc/lib/icalendar-reader.php
@@ -895,7 +895,7 @@ protected function sort_by_recent( $list ) {
* @return array
*/
function icalendar_get_events( $url = '', $count = 5 ) {
- // Find your calendar's address http://support.google.com/calendar/bin/answer.py?hl=en&answer=37103
+ // Find your calendar's address https://support.google.com/calendar/bin/answer.py?hl=en&answer=37103
$ical = new iCalendarReader();
return $ical->get_events( $url, $count );
}
diff --git a/_inc/lib/tonesque.php b/_inc/lib/tonesque.php
index 17158e3d2b6c1..511c838f6cdc4 100644
--- a/_inc/lib/tonesque.php
+++ b/_inc/lib/tonesque.php
@@ -1,13 +1,13 @@
$this->trapped_error['status'],
) );
- // ... unless it's 500 ( see http://wp.me/pMz3w-5VV )
+ // ... unless it's 500
if ( (int) $args['response'] !== 500 ) {
$this->trapped_error['status'] = $args['response'];
}
diff --git a/class.photon.php b/class.photon.php
index 6e351e3005dce..2900994595683 100644
--- a/class.photon.php
+++ b/class.photon.php
@@ -9,7 +9,7 @@ class Jetpack_Photon {
// Oh look, a singleton
private static $__instance = null;
- // Allowed extensions must match http://code.trac.wordpress.org/browser/photon/index.php#L31
+ // Allowed extensions must match https://code.trac.wordpress.org/browser/photon/index.php#L31
protected static $extensions = array(
'gif',
'jpg',
diff --git a/functions.compat.php b/functions.compat.php
index 4e1f47af4a145..691208586862a 100644
--- a/functions.compat.php
+++ b/functions.compat.php
@@ -56,7 +56,7 @@ function youtube_sanitize_url( $url ) {
$url = trim( $url );
$url = str_replace( array( 'youtu.be/', '/v/', '#!v=', '&', '&', 'playlist' ), array( 'youtu.be/?v=', '/?v=', '?v=', '&', '&', 'videoseries' ), $url );
- // Replace any extra question marks with ampersands - the result of a URL like "http://www.youtube.com/v/9FhMMmqzbD8?fs=1&hl=en_US" being passed in.
+ // Replace any extra question marks with ampersands - the result of a URL like "https://www.youtube.com/v/9FhMMmqzbD8?fs=1&hl=en_US" being passed in.
$query_string_start = strpos( $url, "?" );
if ( false !== $query_string_start ) {
diff --git a/functions.opengraph.php b/functions.opengraph.php
index 04a776696fc57..cc60770f4fa43 100644
--- a/functions.opengraph.php
+++ b/functions.opengraph.php
@@ -5,8 +5,8 @@
* Add Open Graph tags so that Facebook (and any other service that supports them)
* can crawl the site better and we provide a better sharing experience.
*
- * @link http://ogp.me/
- * @link http://developers.facebook.com/docs/opengraph/
+ * @link https://ogp.me/
+ * @link https://developers.facebook.com/docs/opengraph/
*
* @package Jetpack
*/
@@ -95,8 +95,8 @@ function jetpack_og_tags() {
$tags['profile:last_name'] = get_the_author_meta( 'last_name', $author->ID );
}
} elseif ( is_archive() ) {
- $tags['og:type'] = 'website';
- $tags['og:title'] = wp_get_document_title();
+ $tags['og:type'] = 'website';
+ $tags['og:title'] = wp_get_document_title();
$archive = get_queried_object();
if ( ! empty( $archive ) ) {
diff --git a/functions.photon.php b/functions.photon.php
index f3e03fe243073..3c7c2f86f3792 100644
--- a/functions.photon.php
+++ b/functions.photon.php
@@ -3,7 +3,7 @@
/**
* Generates a Photon URL.
*
- * @see http://developer.wordpress.com/docs/photon/
+ * @see https://developer.wordpress.com/docs/photon/
*
* @param string $image_url URL to the publicly accessible image you want to manipulate
* @param array|string $args An array of arguments, i.e. array( 'w' => '300', 'resize' => array( 123, 456 ) ), or in string form (w=123&h=456)
@@ -88,7 +88,7 @@ function jetpack_photon_url( $image_url, $args = array(), $scheme = null ) {
}
// Encode values
- // See http://core.trac.wordpress.org/ticket/17923
+ // See https://core.trac.wordpress.org/ticket/17923
$args = rawurlencode_deep( $args );
}
@@ -273,7 +273,7 @@ function jetpack_photon_url_scheme( $url, $scheme ) {
* A wrapper for PHP's parse_url, prepending assumed scheme for network path
* URLs. PHP versions 5.4.6 and earlier do not correctly parse without scheme.
*
- * @see http://php.net/manual/en/function.parse-url.php#refsect1-function.parse-url-changelog
+ * @see https://php.net/manual/en/function.parse-url.php#refsect1-function.parse-url-changelog
*
* @param string $url The URL to parse
* @param integer $component Retrieve specific URL component
diff --git a/json-endpoints/class.wpcom-json-api-update-post-endpoint.php b/json-endpoints/class.wpcom-json-api-update-post-endpoint.php
index 80dccac64f66b..43d6fe11ea84d 100644
--- a/json-endpoints/class.wpcom-json-api-update-post-endpoint.php
+++ b/json-endpoints/class.wpcom-json-api-update-post-endpoint.php
@@ -484,7 +484,7 @@ function write_post( $path, $blog_id, $post_id ) {
$insert['ID'] = $post->ID;
// wp_update_post ignores date unless edit_date is set
- // See: http://codex.wordpress.org/Function_Reference/wp_update_post#Scheduling_posts
+ // See: https://codex.wordpress.org/Function_Reference/wp_update_post#Scheduling_posts
// See: https://core.trac.wordpress.org/browser/tags/3.9.2/src/wp-includes/post.php#L3302
if ( isset( $input['date_gmt'] ) || isset( $input['date'] ) ) {
$insert['edit_date'] = true;
diff --git a/json-endpoints/class.wpcom-json-api-update-post-v1-1-endpoint.php b/json-endpoints/class.wpcom-json-api-update-post-v1-1-endpoint.php
index 3778f16dc74f4..b3d9b98d69af2 100644
--- a/json-endpoints/class.wpcom-json-api-update-post-v1-1-endpoint.php
+++ b/json-endpoints/class.wpcom-json-api-update-post-v1-1-endpoint.php
@@ -559,7 +559,7 @@ function write_post( $path, $blog_id, $post_id ) {
$insert['ID'] = $post->ID;
// wp_update_post ignores date unless edit_date is set
- // See: http://codex.wordpress.org/Function_Reference/wp_update_post#Scheduling_posts
+ // See: https://codex.wordpress.org/Function_Reference/wp_update_post#Scheduling_posts
// See: https://core.trac.wordpress.org/browser/tags/3.9.2/src/wp-includes/post.php#L3302
if ( isset( $input['date_gmt'] ) || isset( $input['date'] ) ) {
$insert['edit_date'] = true;
diff --git a/json-endpoints/class.wpcom-json-api-update-post-v1-2-endpoint.php b/json-endpoints/class.wpcom-json-api-update-post-v1-2-endpoint.php
index 113766a13553e..f0f2d0446fa15 100644
--- a/json-endpoints/class.wpcom-json-api-update-post-v1-2-endpoint.php
+++ b/json-endpoints/class.wpcom-json-api-update-post-v1-2-endpoint.php
@@ -530,7 +530,7 @@ function write_post( $path, $blog_id, $post_id ) {
$insert['ID'] = $post->ID;
// wp_update_post ignores date unless edit_date is set
- // See: http://codex.wordpress.org/Function_Reference/wp_update_post#Scheduling_posts
+ // See: https://codex.wordpress.org/Function_Reference/wp_update_post#Scheduling_posts
// See: https://core.trac.wordpress.org/browser/tags/3.9.2/src/wp-includes/post.php#L3302
if ( isset( $input['date_gmt'] ) || isset( $input['date'] ) ) {
$insert['edit_date'] = true;
diff --git a/load-jetpack.php b/load-jetpack.php
index 4a8bb9cd8204c..9242509f511a5 100644
--- a/load-jetpack.php
+++ b/load-jetpack.php
@@ -72,7 +72,7 @@ function jetpack_should_use_minified_assets() {
jetpack_require_lib( 'debugger' );
}
-// Play nice with http://wp-cli.org/.
+// Play nice with https://wp-cli.org/.
if ( defined( 'WP_CLI' ) && WP_CLI ) {
require_once JETPACK__PLUGIN_DIR . 'class.jetpack-cli.php';
}
@@ -89,7 +89,7 @@ function jetpack_should_use_minified_assets() {
/**
* Add an easy way to photon-ize a URL that is safe to call even if Jetpack isn't active.
*
- * See: http://jetpack.com/2013/07/11/photon-and-themes/
+ * See: https://jetpack.com/2013/07/11/photon-and-themes/
*/
if ( Jetpack::is_module_active( 'photon' ) ) {
add_filter( 'jetpack_photon_url', 'jetpack_photon_url', 10, 3 );
diff --git a/modules/contact-form/admin.php b/modules/contact-form/admin.php
index 8b6a03c0ad80e..c8c7d05334472 100644
--- a/modules/contact-form/admin.php
+++ b/modules/contact-form/admin.php
@@ -89,7 +89,7 @@ function grunion_admin_css() {
* Hack a 'Bulk Delete' option for bulk edit in spam view
*
* There isn't a better way to do this until
- * http://core.trac.wordpress.org/changeset/17297 is resolved
+ * https://core.trac.wordpress.org/changeset/17297 is resolved
*/
add_action( 'admin_head', 'grunion_add_bulk_edit_option' );
function grunion_add_bulk_edit_option() {
diff --git a/modules/contact-form/grunion-contact-form.php b/modules/contact-form/grunion-contact-form.php
index db80aed351588..726452c8df6a7 100644
--- a/modules/contact-form/grunion-contact-form.php
+++ b/modules/contact-form/grunion-contact-form.php
@@ -5,9 +5,9 @@
/*
Plugin Name: Grunion Contact Form
Description: Add a contact form to any post, page or text widget. Emails will be sent to the post's author by default, or any email address you choose. As seen on WordPress.com.
-Plugin URI: http://automattic.com/#
+Plugin URI: https://automattic.com/#
AUthor: Automattic, Inc.
-Author URI: http://automattic.com/
+Author URI: https://automattic.com/
Version: 2.4
License: GPLv2 or later
*/
@@ -1406,7 +1406,7 @@ function download_feedback_as_csv() {
*
* Additionally, Excel exposes the ability to launch arbitrary commands through the DDE protocol.
*
- * @see http://www.contextis.com/resources/blog/comma-separated-vulnerabilities/
+ * @see https://www.contextis.com/en/blog/comma-separated-vulnerabilities
*
* @param string $field
*
diff --git a/modules/contact-form/grunion-editor-view.php b/modules/contact-form/grunion-editor-view.php
index 1b83f18537467..b8ff5c0c66ad0 100644
--- a/modules/contact-form/grunion-editor-view.php
+++ b/modules/contact-form/grunion-editor-view.php
@@ -5,7 +5,7 @@
/*
* A prototype to allow inline editing / editor views for contact forms.\
*
- * Originally developed in: http://github.com/automattic/gm2016-grunion-editor
+ * Originally developed in: https://github.com/automattic/gm2016-grunion-editor
* Authors: Michael Arestad, Andrew Ozz, and George Stephanis
*/
diff --git a/modules/custom-css/csstidy/class.csstidy.php b/modules/custom-css/csstidy/class.csstidy.php
index e92669dafcfff..40eb3e5188619 100644
--- a/modules/custom-css/csstidy/class.csstidy.php
+++ b/modules/custom-css/csstidy/class.csstidy.php
@@ -19,9 +19,9 @@
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*
- * @license http://opensource.org/licenses/lgpl-license.php GNU Lesser General Public License
+ * @license https://opensource.org/licenses/lgpl-license.php GNU Lesser General Public License
* @package csstidy
* @author Florian Schmitz (floele at gmail dot com) 2005-2007
* @author Brett Zamir (brettz9 at yahoo dot com) 2007
@@ -64,7 +64,7 @@
* In opposite to most other CSS parsers, it does not use regular expressions and
* thus has full CSS2 support and a higher reliability.
* Additional to that it applies some optimisations and fixes to the CSS code.
- * An online version should be available here: http://cdburnerxp.se/cssparse/css_optimiser.php
+ * An online version should be available here: https://cdburnerxp.se/cssparse/css_optimiser.php
* @package csstidy
* @author Florian Schmitz (floele at gmail dot com) 2005-2006
* @version 1.3.1
diff --git a/modules/custom-css/csstidy/class.csstidy_ctype.php b/modules/custom-css/csstidy/class.csstidy_ctype.php
index bc5accc508fb8..37e87f7d4f26c 100644
--- a/modules/custom-css/csstidy/class.csstidy_ctype.php
+++ b/modules/custom-css/csstidy/class.csstidy_ctype.php
@@ -22,7 +22,7 @@
* along with CSSTidy; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
- * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @license https://opensource.org/licenses/gpl-license.php GNU Public License
* @package csstidy
* @author Nikolay Matsievsky (speed at webo dot name) 2009-2010
* @version 1.0
@@ -43,4 +43,4 @@ function ctype_alpha($text) {
}
}
-?>
\ No newline at end of file
+?>
diff --git a/modules/custom-css/csstidy/class.csstidy_optimise.php b/modules/custom-css/csstidy/class.csstidy_optimise.php
index 176e0fd3f67f9..e42ac06f31667 100644
--- a/modules/custom-css/csstidy/class.csstidy_optimise.php
+++ b/modules/custom-css/csstidy/class.csstidy_optimise.php
@@ -21,9 +21,9 @@
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*
- * @license http://opensource.org/licenses/lgpl-license.php GNU Lesser General Public License
+ * @license https://opensource.org/licenses/lgpl-license.php GNU Lesser General Public License
* @package csstidy
* @author Florian Schmitz (floele at gmail dot com) 2005-2007
* @author Brett Zamir (brettz9 at yahoo dot com) 2007
diff --git a/modules/custom-css/csstidy/class.csstidy_print.php b/modules/custom-css/csstidy/class.csstidy_print.php
index 56b954040d58e..0e225e87729dd 100644
--- a/modules/custom-css/csstidy/class.csstidy_print.php
+++ b/modules/custom-css/csstidy/class.csstidy_print.php
@@ -20,9 +20,9 @@
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*
- * @license http://opensource.org/licenses/lgpl-license.php GNU Lesser General Public License
+ * @license https://opensource.org/licenses/lgpl-license.php GNU Lesser General Public License
* @package csstidy
* @author Florian Schmitz (floele at gmail dot com) 2005-2007
* @author Brett Zamir (brettz9 at yahoo dot com) 2007
diff --git a/modules/custom-css/csstidy/data.inc.php b/modules/custom-css/csstidy/data.inc.php
index 9ed2e1c44ea2f..0cf8f9a31d15b 100644
--- a/modules/custom-css/csstidy/data.inc.php
+++ b/modules/custom-css/csstidy/data.inc.php
@@ -18,7 +18,7 @@
* along with CSSTidy; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
- * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @license https://opensource.org/licenses/gpl-license.php GNU Public License
* @package csstidy
* @author Florian Schmitz (floele at gmail dot com) 2005
* @author Nikolay Matsievsky (speed at webo dot name) 2010
diff --git a/modules/custom-css/csstidy/lang.inc.php b/modules/custom-css/csstidy/lang.inc.php
index d4c61114d8941..be541cc639111 100644
--- a/modules/custom-css/csstidy/lang.inc.php
+++ b/modules/custom-css/csstidy/lang.inc.php
@@ -18,9 +18,9 @@
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see .
*
- * @license http://opensource.org/licenses/lgpl-license.php GNU Lesser General Public License
+ * @license https://opensource.org/licenses/lgpl-license.php GNU Lesser General Public License
* @package csstidy
* @author Florian Schmitz (floele at gmail dot com) 2005-2007
* @author Brett Zamir (brettz9 at yahoo dot com) 2007
diff --git a/modules/custom-css/custom-css.php b/modules/custom-css/custom-css.php
index 622076bcdb8e8..c2aff8e0f6d0b 100644
--- a/modules/custom-css/custom-css.php
+++ b/modules/custom-css/custom-css.php
@@ -26,7 +26,7 @@ static function init() {
! Jetpack_User_Agent_Info::is_ipad() &&
/**
* Should the Custom CSS module use ACE to process CSS.
- * @see http://ace.c9.io/
+ * @see https://ace.c9.io/
*
* @module custom-css
*
diff --git a/modules/custom-css/custom-css/preprocessors/lessc.inc.php b/modules/custom-css/custom-css/preprocessors/lessc.inc.php
index ddaa47881426f..e4e4973bd37aa 100644
--- a/modules/custom-css/custom-css/preprocessors/lessc.inc.php
+++ b/modules/custom-css/custom-css/preprocessors/lessc.inc.php
@@ -2,7 +2,7 @@
/**
* lessphp v0.5.0
- * http://leafo.net/lessphp
+ * https://leafo.net/lessphp
*
* LESS CSS compiler, adapted from http://lesscss.org
*
@@ -1202,7 +1202,7 @@ protected function lib_percentage($arg) {
// mixes two colors by weight
// mix(@color1, @color2, [@weight: 50%]);
- // http://sass-lang.com/docs/yardoc/Sass/Script/Functions.html#mix-instance_method
+ // https://sass-lang.com/documentation/functions/color#mix
protected function lib_mix($args) {
if ($args[0] != "list" || count($args[2]) < 2)
$this->throwError("mix expects (color1, color2, weight)");
@@ -2593,7 +2593,7 @@ protected function expressionList(&$exps) {
/**
* Attempt to consume an expression.
- * @link http://en.wikipedia.org/wiki/Operator-precedence_parser#Pseudo-code
+ * @link https://en.wikipedia.org/wiki/Operator-precedence_parser#Pseudo-code
*/
protected function expression(&$out) {
if ($this->value($lhs)) {
diff --git a/modules/custom-css/custom-css/preprocessors/scss.inc.php b/modules/custom-css/custom-css/preprocessors/scss.inc.php
index 344b55f1a047b..a59a653bf3ef1 100644
--- a/modules/custom-css/custom-css/preprocessors/scss.inc.php
+++ b/modules/custom-css/custom-css/preprocessors/scss.inc.php
@@ -4,10 +4,10 @@
*
* @copyright 2012-2013 Leaf Corcoran
*
- * @license http://opensource.org/licenses/gpl-license GPL-3.0
- * @license http://opensource.org/licenses/MIT MIT
+ * @license https://opensource.org/licenses/gpl-license GPL-3.0
+ * @license https://opensource.org/licenses/MIT MIT
*
- * @link http://leafo.net/scssphp
+ * @link https://leafo.net/scssphp
*/
/**
@@ -2380,7 +2380,7 @@ public function throwError($msg = null) {
/**
* CSS Colors
*
- * @see http://www.w3.org/TR/css3-color
+ * @see https://www.w3.org/TR/css-color-3/
*/
static protected $cssColors = array(
'aliceblue' => '240,248,255',
diff --git a/modules/custom-post-types/comics.php b/modules/custom-post-types/comics.php
index 91647e80993d0..ab8facd02b1ea 100644
--- a/modules/custom-post-types/comics.php
+++ b/modules/custom-post-types/comics.php
@@ -280,7 +280,7 @@ public function manage_posts_custom_column( $column_name, $post_ID ) {
* for Feedbag (the Reader's feed storage mechanism), eschew
* a pretty URL for one that will get the post into the Reader.
*
- * @see http://core.trac.wordpress.org/ticket/19744
+ * @see https://core.trac.wordpress.org/ticket/19744
* @param string $permalink The existing (possibly pretty) permalink.
*/
public function custom_permalink_for_feedbag( $permalink ) {
@@ -311,7 +311,7 @@ function updated_messages( $messages ) {
7 => esc_html__( 'Comic saved.', 'jetpack' ),
8 => sprintf( __( 'Comic submitted. Preview comic ', 'jetpack'), esc_url( add_query_arg( 'preview', 'true', get_permalink( $post->ID ) ) ) ),
9 => sprintf( __( 'Comic scheduled for: %1$s . Preview comic ', 'jetpack' ),
- // translators: Publish box date format, see http://php.net/date
+ // translators: Publish box date format, see https://php.net/date
date_i18n( __( 'M j, Y @ G:i', 'jetpack' ), strtotime( $post->post_date ) ), esc_url( get_permalink($post->ID) ) ),
10 => sprintf( __( 'Comic draft updated. Preview comic ', 'jetpack' ), esc_url( add_query_arg( 'preview', 'true', get_permalink( $post->ID ) ) ) ),
);
diff --git a/modules/custom-post-types/nova.php b/modules/custom-post-types/nova.php
index cc3ab922837b1..b4cf0281f4596 100644
--- a/modules/custom-post-types/nova.php
+++ b/modules/custom-post-types/nova.php
@@ -280,7 +280,7 @@ function updated_messages( $messages ) {
8 => sprintf( __( 'Menu item submitted. Preview item ', 'jetpack' ), esc_url( add_query_arg( 'preview', 'true', get_permalink( $post->ID ) ) ) ),
/* translators: this is about a food menu */
9 => sprintf( __( 'Menu item scheduled for: %1$s . Preview item ', 'jetpack' ),
- // translators: Publish box date format, see http://php.net/date
+ // translators: Publish box date format, see https://php.net/date
date_i18n( __( 'M j, Y @ G:i', 'jetpack' ), strtotime( $post->post_date ) ), esc_url( get_permalink($post->ID) ) ),
/* translators: this is about a food menu */
10 => sprintf( __( 'Menu item draft updated. Preview item ', 'jetpack' ), esc_url( add_query_arg( 'preview', 'true', get_permalink( $post->ID ) ) ) ),
diff --git a/modules/custom-post-types/portfolios.php b/modules/custom-post-types/portfolios.php
index dd3858ee672f5..8de5cd632b791 100644
--- a/modules/custom-post-types/portfolios.php
+++ b/modules/custom-post-types/portfolios.php
@@ -383,7 +383,7 @@ function updated_messages( $messages ) {
7 => esc_html__( 'Project saved.', 'jetpack' ),
8 => sprintf( __( 'Project submitted. Preview project ', 'jetpack'), esc_url( add_query_arg( 'preview', 'true', get_permalink( $post->ID ) ) ) ),
9 => sprintf( __( 'Project scheduled for: %1$s . Preview project ', 'jetpack' ),
- // translators: Publish box date format, see http://php.net/date
+ // translators: Publish box date format, see https://php.net/date
date_i18n( __( 'M j, Y @ G:i', 'jetpack' ), strtotime( $post->post_date ) ), esc_url( get_permalink( $post->ID ) ) ),
10 => sprintf( __( 'Project item draft updated. Preview project ', 'jetpack' ), esc_url( add_query_arg( 'preview', 'true', get_permalink( $post->ID ) ) ) ),
);
diff --git a/modules/custom-post-types/testimonial.php b/modules/custom-post-types/testimonial.php
index ba427244128a3..b67f1b4f5de34 100644
--- a/modules/custom-post-types/testimonial.php
+++ b/modules/custom-post-types/testimonial.php
@@ -352,7 +352,7 @@ function updated_messages( $messages ) {
7 => esc_html__( 'Testimonial saved.', 'jetpack' ),
8 => sprintf( __( 'Testimonial submitted. Preview testimonial ', 'jetpack'), esc_url( add_query_arg( 'preview', 'true', get_permalink( $post->ID ) ) ) ),
9 => sprintf( __( 'Testimonial scheduled for: %1$s . Preview testimonial ', 'jetpack' ),
- // translators: Publish box date format, see http://php.net/date
+ // translators: Publish box date format, see https://php.net/date
date_i18n( __( 'M j, Y @ G:i', 'jetpack' ), strtotime( $post->post_date ) ), esc_url( get_permalink($post->ID) ) ),
10 => sprintf( __( 'Testimonial draft updated. Preview testimonial ', 'jetpack' ), esc_url( add_query_arg( 'preview', 'true', get_permalink( $post->ID ) ) ) ),
);
diff --git a/modules/google-analytics/wp-google-analytics.php b/modules/google-analytics/wp-google-analytics.php
index 8d7cdf24b80c7..5c8655bd9a85f 100644
--- a/modules/google-analytics/wp-google-analytics.php
+++ b/modules/google-analytics/wp-google-analytics.php
@@ -20,7 +20,7 @@
/**
* Jetpack_Google_Analytics is the class that handles ALL of the plugin functionality.
* It helps us avoid name collisions
- * http://codex.wordpress.org/Writing_a_Plugin#Avoiding_Function_Name_Collisions
+ * https://codex.wordpress.org/Writing_a_Plugin#Avoiding_Function_Name_Collisions
*/
if ( ! defined( 'ABSPATH' ) ) {
diff --git a/modules/infinite-scroll/infinity.php b/modules/infinite-scroll/infinity.php
index 3cc5a60c2615f..6b8d3775b333b 100644
--- a/modules/infinite-scroll/infinity.php
+++ b/modules/infinite-scroll/infinity.php
@@ -4,13 +4,13 @@
/*
Plugin Name: The Neverending Home Page.
-Plugin URI: http://automattic.com/
+Plugin URI: https://automattic.com/
Description: Adds infinite scrolling support to the front-end blog post view for themes, pulling the next set of posts automatically into view when the reader approaches the bottom of the page.
Version: 1.1
Author: Automattic
-Author URI: http://automattic.com/
+Author URI: https://automattic.com/
License: GNU General Public License v2 or later
-License URI: http://www.gnu.org/licenses/gpl-2.0.html
+License URI: https://www.gnu.org/licenses/gpl-2.0.html
*/
/**
diff --git a/modules/markdown/easy-markdown.php b/modules/markdown/easy-markdown.php
index 06a2cab903350..6648bd4be49a2 100644
--- a/modules/markdown/easy-markdown.php
+++ b/modules/markdown/easy-markdown.php
@@ -2,18 +2,18 @@
/*
Plugin Name: Easy Markdown
-Plugin URI: http://automattic.com/
+Plugin URI: https://automattic.com/
Description: Write in Markdown, publish in WordPress
Version: 0.1
Author: Matt Wiebe
-Author URI: http://automattic.com/
+Author URI: https://automattic.com/
*/
/**
* Copyright (c) Automattic. All rights reserved.
*
* Released under the GPL license
- * http://www.opensource.org/licenses/gpl-license.php
+ * https://www.opensource.org/licenses/gpl-license.php
*
* This is an add-on for WordPress
* https://wordpress.org/
diff --git a/modules/minileven/minileven.php b/modules/minileven/minileven.php
index c7ab05e2e1a04..4c20924220f71 100644
--- a/modules/minileven/minileven.php
+++ b/modules/minileven/minileven.php
@@ -8,7 +8,7 @@
// http://alexking.org/projects/wordpress
//
// Released under the GPL license
-// http://www.opensource.org/licenses/gpl-license.php
+// https://www.opensource.org/licenses/gpl-license.php
//
// **********************************************************************
// This program is distributed in the hope that it will be useful, but
diff --git a/modules/minileven/theme/pub/minileven/index.php b/modules/minileven/theme/pub/minileven/index.php
index 63a51a19da7fc..14a1afdc646a3 100644
--- a/modules/minileven/theme/pub/minileven/index.php
+++ b/modules/minileven/theme/pub/minileven/index.php
@@ -6,7 +6,7 @@
* and one of the two required files for a theme (the other being style.css).
* It is used to display a page when nothing more specific matches a query.
* E.g., it puts together the home page when no home.php file exists.
- * Learn more: http://codex.wordpress.org/Template_Hierarchy
+ * Learn more: https://codex.wordpress.org/Template_Hierarchy
*
* @package Minileven
*/
diff --git a/modules/sharedaddy/sharedaddy.php b/modules/sharedaddy/sharedaddy.php
index 1e5de22cbc870..2a8e11581a955 100644
--- a/modules/sharedaddy/sharedaddy.php
+++ b/modules/sharedaddy/sharedaddy.php
@@ -4,8 +4,8 @@
Description: The most super duper sharing tool on the interwebs.
Version: 0.3.1
Author: Automattic, Inc.
-Author URI: http://automattic.com/
-Plugin URI: http://en.blog.wordpress.com/2010/08/24/more-ways-to-share/
+Author URI: https://automattic.com/
+Plugin URI: https://en.blog.wordpress.com/2010/08/24/more-ways-to-share/
*/
require_once plugin_dir_path( __FILE__ ).'sharing.php';
diff --git a/modules/shortcodes/archiveorg-book.php b/modules/shortcodes/archiveorg-book.php
index 88ac328c4cf4f..055b798d98204 100644
--- a/modules/shortcodes/archiveorg-book.php
+++ b/modules/shortcodes/archiveorg-book.php
@@ -4,7 +4,7 @@
*
* Usage:
* [archiveorg-book goodytwoshoes00newyiala]
- * [archiveorg-book http://www.archive.org/stream/goodytwoshoes00newyiala]
+ * [archiveorg-book https://www.archive.org/stream/goodytwoshoes00newyiala]
* [archiveorg id=goodytwoshoes00newyiala width=480 height=430]
*
@@ -76,7 +76,7 @@ function jetpack_archiveorg_book_shortcode( $atts ) {
$height = intval( $atts['height'] );
}
- $url = esc_url( set_url_scheme( "http://archive.org/stream/{$id}?ui=embed#mode/1up" ) );
+ $url = esc_url( "https://archive.org/stream/{$id}?ui=embed#mode/1up" );
$html = "
";
return $html;
diff --git a/modules/shortcodes/brightcove.php b/modules/shortcodes/brightcove.php
index 584ccf2fc3750..4a08b9a8e38f3 100644
--- a/modules/shortcodes/brightcove.php
+++ b/modules/shortcodes/brightcove.php
@@ -53,7 +53,7 @@ public static function convert( $atts ) {
* The latest: [shortcode a=1 b=2] and the legacy: [shortcode a=1&b=2]
* For an old shortcode: [shortcode a=1&b=2&c=3], it would be parsed into array( 'a' => 1&b=2&c=3' ), which is useless.
* However, since we want to determine whether to call convert_to_legacy_studio() or convert_to_new_studio() via passed parameters, we still need to parse the two properly.
- * See http://jetpack.wp-a2z.org/oik_api/shortcode_new_to_old_params/
+ * See https://jetpack.wp-a2z.org/oik_api/shortcode_new_to_old_params/
*
* @since 4.5.0
*
diff --git a/modules/sitemaps/sitemap-builder.php b/modules/sitemaps/sitemap-builder.php
index e04f58d5ab845..d6077c0fd3226 100644
--- a/modules/sitemaps/sitemap-builder.php
+++ b/modules/sitemaps/sitemap-builder.php
@@ -998,7 +998,7 @@ private function build_one_sitemap_index( $number, $from_id, $datetime, $index_t
/**
* Construct the sitemap index url entry for a sitemap row.
*
- * @link http://www.sitemaps.org/protocol.html#sitemapIndex_sitemap
+ * @link https://www.sitemaps.org/protocol.html#sitemapIndex_sitemap
*
* @access private
* @since 4.8.0
@@ -1104,7 +1104,7 @@ public function news_sitemap_xml() {
/**
* Construct the sitemap url entry for a WP_Post.
*
- * @link http://www.sitemaps.org/protocol.html#urldef
+ * @link https://www.sitemaps.org/protocol.html#urldef
* @access private
* @since 4.8.0
*
@@ -1182,7 +1182,7 @@ private function post_to_sitemap_item( $post ) {
/**
* Construct the image sitemap url entry for a WP_Post of image type.
*
- * @link http://www.sitemaps.org/protocol.html#urldef
+ * @link https://www.sitemaps.org/protocol.html#urldef
*
* @access private
* @since 4.8.0
@@ -1267,7 +1267,7 @@ private function image_post_to_sitemap_item( $post ) {
/**
* Construct the video sitemap url entry for a WP_Post of video type.
*
- * @link http://www.sitemaps.org/protocol.html#urldef
+ * @link https://www.sitemaps.org/protocol.html#urldef
* @link https://developers.google.com/webmasters/videosearch/sitemaps
*
* @access private
@@ -1377,7 +1377,7 @@ private function video_post_to_sitemap_item( $post ) {
/**
* Construct the news sitemap url entry for a WP_Post.
*
- * @link http://www.sitemaps.org/protocol.html#urldef
+ * @link https://www.sitemaps.org/protocol.html#urldef
*
* @access private
* @since 4.8.0
@@ -1417,7 +1417,7 @@ private function post_to_news_sitemap_item( $post ) {
/*
* Trim the locale to an ISO 639 language code as required by Google.
* Special cases are zh-cn (Simplified Chinese) and zh-tw (Traditional Chinese).
- * @link http://www.loc.gov/standards/iso639-2/php/code_list.php
+ * @link https://www.loc.gov/standards/iso639-2/php/code_list.php
*/
$language = strtolower( get_locale() );
diff --git a/modules/sitemaps/sitemap-constants.php b/modules/sitemaps/sitemap-constants.php
index 3c4fca9404183..ed0ccad0c388f 100644
--- a/modules/sitemaps/sitemap-constants.php
+++ b/modules/sitemaps/sitemap-constants.php
@@ -27,7 +27,7 @@
* Maximum size (in bytes) of a sitemap xml file.
* Max is 716800 = 700kb to avoid potential failures for default memcached limits (1MB)
*
- * @link http://www.sitemaps.org/
+ * @link https://www.sitemaps.org/
* @since 4.8.0
*/
if ( ! defined( 'JP_SITEMAP_MAX_BYTES' ) ) {
@@ -38,7 +38,7 @@
* Maximum size (in url nodes) of a sitemap xml file.
* Per the spec, max value is 50000.
*
- * @link http://www.sitemaps.org/
+ * @link https://www.sitemaps.org/
* @since 4.8.0
*/
if ( ! defined( 'JP_SITEMAP_MAX_ITEMS' ) ) {
diff --git a/modules/sitemaps/sitemap-stylist.php b/modules/sitemaps/sitemap-stylist.php
index ce883d7f14eec..30ea26f4609f5 100644
--- a/modules/sitemaps/sitemap-stylist.php
+++ b/modules/sitemaps/sitemap-stylist.php
@@ -33,7 +33,7 @@ class Jetpack_Sitemap_Stylist {
*
* @access private
* @since 4.8.0
- * @link http://php.net/manual/en/function.vsprintf.php Format string documentation.
+ * @link https://php.net/manual/en/function.vsprintf.php Format string documentation.
*
* @param string $format A vsprintf-style format string to be sanitized.
* @param array $url_array The string substitution array to be passed to vsprintf.
diff --git a/modules/sitemaps/sitemaps.php b/modules/sitemaps/sitemaps.php
index d374020398667..9fcd0529632d1 100644
--- a/modules/sitemaps/sitemaps.php
+++ b/modules/sitemaps/sitemaps.php
@@ -14,7 +14,7 @@
* well as the home url. To include other post types use the 'jetpack_sitemap_post_types'
* filter.
*
- * @link http://sitemaps.org/protocol.php Base sitemaps protocol.
+ * @link https://www.sitemaps.org/protocol.html Base sitemaps protocol.
* @link https://support.google.com/webmasters/answer/178636 Image sitemap extension.
* @link https://developers.google.com/webmasters/videosearch/sitemaps Video sitemap extension.
*
@@ -23,7 +23,7 @@
* completeness, instead including at most 1000 of the most recent published posts
* from the previous 2 days, per the news-sitemap spec.
*
- * @link http://www.google.com/support/webmasters/bin/answer.py?answer=74288 News sitemap extension.
+ * @link https://support.google.com/webmasters/answer/74288 News sitemap extension.
*
* @package Jetpack
* @since 3.9.0
@@ -546,7 +546,7 @@ public function callback_action_filter_sitemap_location() {
* This way we don't have to wait for init to finish before building sitemaps.
*
* @link https://tools.ietf.org/html/rfc3986#section-3.3 RFC 3986
- * @link http://www.sitemaps.org/ The sitemap protocol
+ * @link https://www.sitemaps.org/ The sitemap protocol
*
* @since 4.8.0
*/
diff --git a/modules/theme-tools/compat/twentyfifteen.php b/modules/theme-tools/compat/twentyfifteen.php
index adaa42b7f6830..b51149c62001b 100644
--- a/modules/theme-tools/compat/twentyfifteen.php
+++ b/modules/theme-tools/compat/twentyfifteen.php
@@ -1,7 +1,7 @@
add_setting(
'featured-content[tag-name]',
diff --git a/modules/theme-tools/random-redirect.php b/modules/theme-tools/random-redirect.php
index d866d336e3f2e..a636b6b63b11b 100644
--- a/modules/theme-tools/random-redirect.php
+++ b/modules/theme-tools/random-redirect.php
@@ -5,12 +5,12 @@
Description: Allows you to create a link to yourblog.example.com/?random which will redirect someone to a random post on your blog, in a StumbleUpon-like fashion.
Version: 1.2-wpcom
Author: Matt Mullenweg
-Author URI: http://photomatt.net/
+Author URI: https://ma.tt/
*/
function jetpack_matt_random_redirect() {
// Verify that the Random Redirect plugin this code is from is not active
- // See http://plugins.trac.wordpress.org/ticket/1898
+ // See https://plugins.trac.wordpress.org/ticket/1898
if ( ! ( defined( 'IS_WPCOM' ) && IS_WPCOM ) ) {
require_once ABSPATH . 'wp-admin/includes/plugin.php';
if ( is_plugin_active( 'random-redirect/random-redirect.php' ) ) {
diff --git a/modules/theme-tools/site-logo.php b/modules/theme-tools/site-logo.php
index 04f16b7162492..cef77e69ba1b3 100644
--- a/modules/theme-tools/site-logo.php
+++ b/modules/theme-tools/site-logo.php
@@ -1,7 +1,7 @@
$mime_type ) {
$extras = explode( '|', $type );
diff --git a/tools/export-translations.php b/tools/export-translations.php
index 71c4d3136be9c..3d4c1079dba62 100644
--- a/tools/export-translations.php
+++ b/tools/export-translations.php
@@ -1,7 +1,7 @@
Date: Thu, 22 Aug 2019 23:41:46 -0700
Subject: [PATCH 2/6] Switch to HTTPS for links. No string changes.
---
_inc/lib/debugger/class-jetpack-debugger.php | 6 +++---
modules/custom-content-types.php | 2 +-
modules/custom-css/custom-css.php | 2 +-
modules/custom-post-types/portfolios.php | 2 +-
modules/custom-post-types/testimonial.php | 2 +-
modules/markdown/easy-markdown.php | 2 +-
modules/masterbar/masterbar.php | 2 +-
modules/module-info.php | 2 +-
modules/post-by-email.php | 2 +-
modules/protect.php | 2 +-
modules/sharedaddy/sharedaddy.php | 2 +-
modules/sharedaddy/sharing.php | 2 +-
modules/shortcodes/dailymotion.php | 4 ++--
modules/shortcodes/scribd.php | 2 +-
modules/sitemaps/sitemap-stylist.php | 20 +++++++++----------
modules/theme-tools/random-redirect.php | 2 +-
.../videopress/class.videopress-player.php | 6 +++---
modules/widgets/flickr/form.php | 2 +-
modules/widgets/image-widget.php | 6 +++---
modules/widgets/top-posts.php | 2 +-
tools/import-translations.php | 2 +-
21 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/_inc/lib/debugger/class-jetpack-debugger.php b/_inc/lib/debugger/class-jetpack-debugger.php
index 485bcc1cd2d06..4e42e30bb58e8 100644
--- a/_inc/lib/debugger/class-jetpack-debugger.php
+++ b/_inc/lib/debugger/class-jetpack-debugger.php
@@ -144,9 +144,9 @@ public static function jetpack_debug_display_handler() {
),
)
),
- 'http://jetpack.com/support/getting-started-with-jetpack/known-issues/',
- 'http://jetpack.com/support/getting-started-with-jetpack/known-issues/',
- 'http://jetpack.com/support/',
+ 'https://jetpack.com/support/getting-started-with-jetpack/known-issues/',
+ 'https://jetpack.com/support/getting-started-with-jetpack/known-issues/',
+ 'https://jetpack.com/support/',
'https://wordpress.org/support/plugin/jetpack'
);
?>
diff --git a/modules/custom-content-types.php b/modules/custom-content-types.php
index 5976bfc190270..e213e258904ec 100644
--- a/modules/custom-content-types.php
+++ b/modules/custom-content-types.php
@@ -39,7 +39,7 @@ function jetpack_cpt_section_callback() {
?>
-
+
diff --git a/modules/custom-post-types/portfolios.php b/modules/custom-post-types/portfolios.php
index 8de5cd632b791..e41728fcfcf82 100644
--- a/modules/custom-post-types/portfolios.php
+++ b/modules/custom-post-types/portfolios.php
@@ -137,7 +137,7 @@ function setting_html() {
type="checkbox" value="1" />
-
+
">
type="checkbox" value="1" />
-
+
user_email, 128, 'mm', '', array( 'force_display' => true ) );
$user_info .= '' . $this->display_name . ' ';
- $user_info .= '@' . $this->user_login . ' ';
+ $user_info .= '@' . $this->user_login . ' ';
$user_info .= sprintf(
'',
diff --git a/modules/module-info.php b/modules/module-info.php
index f13964de081a0..0897521c080c9 100644
--- a/modules/module-info.php
+++ b/modules/module-info.php
@@ -78,7 +78,7 @@ function jetpack_shortcodes_more_info() {
* Shortlinks support link.
*/
function wpme_load_more_link() {
- echo 'http://wp.me/p1moTy-DL';
+ echo 'https://wp.me/p1moTy-DL';
}
add_filter( 'jetpack_learn_more_button_shortlinks', 'wpme_load_more_link' );
diff --git a/modules/post-by-email.php b/modules/post-by-email.php
index f25d4780f18dd..851303c12b626 100644
--- a/modules/post-by-email.php
+++ b/modules/post-by-email.php
@@ -99,7 +99,7 @@ function user_profile() {
>
-
+
diff --git a/modules/protect.php b/modules/protect.php
index 53212028cc655..f6d78c68e749c 100644
--- a/modules/protect.php
+++ b/modules/protect.php
@@ -181,7 +181,7 @@ public function admin_jetpack_manage_notice() {
-
Learn More', 'jetpack' ), 'http://jetpack.com/support/multisite-protect' ); ?>
+
Learn More', 'jetpack' ), 'https://jetpack.com/support/multisite-protect' ); ?>
' . __( 'Settings', 'jetpack' ) . ' ';
- $links[] = '
' . __( 'Support', 'jetpack' ) . ' ';
+ $links[] = '
' . __( 'Support', 'jetpack' ) . ' ';
}
return $links;
diff --git a/modules/sharedaddy/sharing.php b/modules/sharedaddy/sharing.php
index c36e0d1442f3a..805dc172ff145 100644
--- a/modules/sharedaddy/sharing.php
+++ b/modules/sharedaddy/sharing.php
@@ -214,7 +214,7 @@ public function management_page() {
if ( false == function_exists( 'mb_stripos' ) ) {
echo '
' . __( 'Warning! Multibyte support missing!', 'jetpack' ) . ' ';
- echo '
' . sprintf( __( 'This plugin will work without it, but multibyte support is used if available . You may see minor problems with Tweets and other sharing services.', 'jetpack' ), 'http://www.php.net/manual/en/mbstring.installation.php' ) . '
';
+ echo '
' . sprintf( __( 'This plugin will work without it, but multibyte support is used if available . You may see minor problems with Tweets and other sharing services.', 'jetpack' ), 'https://www.php.net/manual/en/mbstring.installation.php' ) . '
';
}
if ( isset( $_GET['update'] ) && $_GET['update'] == 'saved' ) {
diff --git a/modules/shortcodes/dailymotion.php b/modules/shortcodes/dailymotion.php
index fd2d620fe19d8..0cb72935abd24 100644
--- a/modules/shortcodes/dailymotion.php
+++ b/modules/shortcodes/dailymotion.php
@@ -208,7 +208,7 @@ function dailymotion_shortcode( $atts ) {
&& array_key_exists( 'title', $atts )
&& $title
) {
- $output .= '
' . esc_html( $title ) . ' ';
+ $output .= '
' . esc_html( $title ) . ' ';
}
$user = preg_replace( '/[^-a-z0-9_]/i', '', $atts['user'] );
@@ -218,7 +218,7 @@ function dailymotion_shortcode( $atts ) {
sprintf(
/* Translators: placeholder is a Dailymotion username, linking to a Dailymotion profile page. */
__( 'Uploaded by %s', 'jetpack' ),
- '
' . esc_html( $user ) . ' '
+ '
' . esc_html( $user ) . ' '
),
array(
'a' => array(
diff --git a/modules/shortcodes/scribd.php b/modules/shortcodes/scribd.php
index b7e470ec423cc..a0101ad2cac44 100644
--- a/modules/shortcodes/scribd.php
+++ b/modules/shortcodes/scribd.php
@@ -52,7 +52,7 @@ function scribd_shortcode_handler( $atts ) {
function scribd_shortcode_markup( $atts ) {
$markup = <<
-
+
EOD;
return $markup;
diff --git a/modules/sitemaps/sitemap-stylist.php b/modules/sitemaps/sitemap-stylist.php
index 30ea26f4609f5..7ee953b0f8ae1 100644
--- a/modules/sitemaps/sitemap-stylist.php
+++ b/modules/sitemaps/sitemap-stylist.php
@@ -74,7 +74,7 @@ public static function sitemap_xsl() {
'jetpack'
),
array(
- 1 => 'http://jetpack.com/',
+ 1 => 'https://jetpack.com/',
2 => 'https://www.google.com/',
3 => 'https://www.bing.com/',
)
@@ -86,7 +86,7 @@ public static function sitemap_xsl() {
'jetpack'
),
array(
- 1 => 'http://sitemaps.org',
+ 1 => 'https://sitemaps.org',
)
);
@@ -186,7 +186,7 @@ public static function sitemap_index_xsl() {
'jetpack'
),
array(
- 1 => 'http://jetpack.com/',
+ 1 => 'https://jetpack.com/',
2 => 'https://www.google.com/',
3 => 'https://www.bing.com/',
)
@@ -206,7 +206,7 @@ public static function sitemap_index_xsl() {
'jetpack'
),
array(
- 1 => 'http://sitemaps.org',
+ 1 => 'https://sitemaps.org',
)
);
@@ -314,7 +314,7 @@ public static function image_sitemap_xsl() {
'jetpack'
),
array(
- 1 => 'http://jetpack.com/',
+ 1 => 'https://jetpack.com/',
2 => 'https://www.google.com/',
3 => 'https://www.bing.com/',
)
@@ -326,7 +326,7 @@ public static function image_sitemap_xsl() {
'jetpack'
),
array(
- 1 => 'http://sitemaps.org',
+ 1 => 'https://sitemaps.org',
)
);
@@ -454,7 +454,7 @@ public static function video_sitemap_xsl() {
'jetpack'
),
array(
- 1 => 'http://jetpack.com/',
+ 1 => 'https://jetpack.com/',
2 => 'https://www.google.com/',
3 => 'https://www.bing.com/',
)
@@ -466,7 +466,7 @@ public static function video_sitemap_xsl() {
'jetpack'
),
array(
- 1 => 'http://sitemaps.org',
+ 1 => 'https://sitemaps.org',
)
);
@@ -594,7 +594,7 @@ public static function news_sitemap_xsl() {
'jetpack'
),
array(
- 1 => 'http://jetpack.com/',
+ 1 => 'https://jetpack.com/',
2 => 'https://www.google.com/',
3 => 'https://www.bing.com/',
)
@@ -606,7 +606,7 @@ public static function news_sitemap_xsl() {
'jetpack'
),
array(
- 1 => 'http://sitemaps.org',
+ 1 => 'https://sitemaps.org',
)
);
diff --git a/modules/theme-tools/random-redirect.php b/modules/theme-tools/random-redirect.php
index a636b6b63b11b..e78e0277eae99 100644
--- a/modules/theme-tools/random-redirect.php
+++ b/modules/theme-tools/random-redirect.php
@@ -49,7 +49,7 @@ function jetpack_matt_random_redirect() {
// Persistent AppEngine abuse. ORDER BY RAND is expensive.
if ( strstr( $_SERVER['HTTP_USER_AGENT'], 'AppEngine-Google' ) ) {
- wp_die( 'Please contact support ' );
+ wp_die( 'Please contact support ' );
}
// Set the category ID if the parameter is set.
diff --git a/modules/videopress/class.videopress-player.php b/modules/videopress/class.videopress-player.php
index c33027431968d..ab5105df94060 100644
--- a/modules/videopress/class.videopress-player.php
+++ b/modules/videopress/class.videopress-player.php
@@ -305,7 +305,7 @@ private function html_age_gate() {
$html .= ' ';
$html .= '';
- $html .= '' . __( 'More information', 'jetpack' ) . '
';
+ $html .= '' . __( 'More information', 'jetpack' ) . '
';
$html .= ' ';
return $html;
@@ -359,7 +359,7 @@ private function html5_static() {
}
$html .= '" src="' . $thumbnail . '" width="' . $this->video->calculated_width . '" height="' . $this->video->calculated_height . '" />';
if ( isset( $this->options['freedom'] ) && $this->options['freedom'] === true ) {
- $html .= '' . sprintf( __( 'You do not have sufficient freedom levels to view this video. Support free software and upgrade.', 'jetpack' ), 'http://www.gnu.org/philosophy/free-sw.html' ) . '
';
+ $html .= '' . sprintf( __( 'You do not have sufficient freedom levels to view this video. Support free software and upgrade.', 'jetpack' ), 'https://www.gnu.org/philosophy/free-sw.html' ) . '
';
} elseif ( isset( $this->video->title ) ) {
$html .= '' . esc_html( $this->video->title ) . '
';
}
@@ -849,7 +849,7 @@ private function flash_object() {
foreach ( $this->get_flash_parameters() as $attribute => $value ) {
$flash_params .= ' ';
}
- $flash_help = sprintf( __( 'This video requires Adobe Flash for playback.', 'jetpack' ), 'http://www.adobe.com/go/getflashplayer' );
+ $flash_help = sprintf( __( 'This video requires Adobe Flash for playback.', 'jetpack' ), 'https://get.adobe.com/flashplayer/' );
$flash_player_url = esc_url( $this->video->players->swf->url, array( 'http', 'https' ) );
$description = '';
if ( isset( $this->video->title ) ) {
diff --git a/modules/widgets/flickr/form.php b/modules/widgets/flickr/form.php
index 00fccc15be183..0dfc5c9a9ca7e 100644
--- a/modules/widgets/flickr/form.php
+++ b/modules/widgets/flickr/form.php
@@ -30,7 +30,7 @@ class="widefat"
interesting Flickr photos.', 'jetpack' ),
- 'http://www.flickr.com/explore/interesting'
+ 'https://www.flickr.com/explore/interesting'
); ?>
diff --git a/modules/widgets/image-widget.php b/modules/widgets/image-widget.php
index 37a353c19f808..d455b4c2993ab 100644
--- a/modules/widgets/image-widget.php
+++ b/modules/widgets/image-widget.php
@@ -229,13 +229,13 @@ public function form( $instance ) {
' . esc_html__( 'Image URL:', 'jetpack' ) . '
- ' . esc_html__( 'Alternate text:', 'jetpack' ) . ' ( ? )
+ ' . esc_html__( 'Alternate text:', 'jetpack' ) . ' ( ? )
- ' . esc_html__( 'Image title:', 'jetpack' ) . ' ( ? )
+ ' . esc_html__( 'Image title:', 'jetpack' ) . ' ( ? )
- ' . esc_html__( 'Caption:', 'jetpack' ) . ' ( ? )
+ ' . esc_html__( 'Caption:', 'jetpack' ) . ' ( ? )
';
diff --git a/modules/widgets/top-posts.php b/modules/widgets/top-posts.php
index a4140e435d8cf..442dddd7b0be8 100644
--- a/modules/widgets/top-posts.php
+++ b/modules/widgets/top-posts.php
@@ -310,7 +310,7 @@ function widget( $args, $instance ) {
if ( ! $posts ) {
$link = 'https://jetpack.com/support/getting-more-views-and-traffic/';
if ( defined( 'IS_WPCOM' ) && IS_WPCOM ) {
- $link = 'http://en.support.wordpress.com/getting-more-site-traffic/';
+ $link = 'https://en.support.wordpress.com/getting-more-site-traffic/';
}
if ( current_user_can( 'edit_theme_options' ) ) {
diff --git a/tools/import-translations.php b/tools/import-translations.php
index e06842655d544..7b670445e0074 100644
--- a/tools/import-translations.php
+++ b/tools/import-translations.php
@@ -63,7 +63,7 @@ function apize_url( $url ) {
$origin_urls[] = $origin_url;
}
- $origin_urls[] = 'http://translate.wordpress.com/api/projects/wpcom';
+ $origin_urls[] = 'https://translate.wordpress.com/api/projects/wpcom';
*/
die_error( 'No SOURCE_URLs specified' );
}
From 7525dabdec0a7d268eb8ae704acbb755b476158f Mon Sep 17 00:00:00 2001
From: Michael D Adams
Date: Thu, 22 Aug 2019 23:44:51 -0700
Subject: [PATCH 3/6] Switch to HTTPS for links. These require string changes.
---
_inc/lib/class.core-rest-api-endpoints.php | 2 +-
modules/carousel/jetpack-carousel.php | 2 +-
modules/custom-css/csstidy/lang.inc.php | 8 ++++----
modules/custom-css/custom-css.php | 4 ++--
modules/custom-post-types/comics.php | 2 +-
modules/subscriptions/views.php | 4 ++--
6 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/_inc/lib/class.core-rest-api-endpoints.php b/_inc/lib/class.core-rest-api-endpoints.php
index 9fe736ee9f17b..c51cfb1b4656a 100644
--- a/_inc/lib/class.core-rest-api-endpoints.php
+++ b/_inc/lib/class.core-rest-api-endpoints.php
@@ -1623,7 +1623,7 @@ public static function get_updateable_data_list( $selector = '' ) {
'jp_group' => 'carousel',
),
'carousel_display_exif' => array(
- 'description' => wp_kses( sprintf( __( 'Show photo metadata (Exif ) in carousel, when available.', 'jetpack' ) ), array( 'a' => array( 'href' => true, 'target' => true ) ) ),
+ 'description' => wp_kses( sprintf( __( 'Show photo metadata (Exif ) in carousel, when available.', 'jetpack' ) ), array( 'a' => array( 'href' => true, 'target' => true ) ) ),
'type' => 'boolean',
'default' => 0,
'validate_callback' => __CLASS__ . '::validate_boolean',
diff --git a/modules/carousel/jetpack-carousel.php b/modules/carousel/jetpack-carousel.php
index 207e880ad18dc..0bce42d91d4f3 100644
--- a/modules/carousel/jetpack-carousel.php
+++ b/modules/carousel/jetpack-carousel.php
@@ -792,7 +792,7 @@ function settings_select( $name, $values, $extra_text = '' ) {
}
function carousel_display_exif_callback() {
- $this->settings_checkbox( 'carousel_display_exif', __( 'Show photo metadata (Exif ) in carousel, when available.', 'jetpack' ) );
+ $this->settings_checkbox( 'carousel_display_exif', __( 'Show photo metadata (Exif ) in carousel, when available.', 'jetpack' ) );
}
function carousel_display_exif_sanitize( $value ) {
diff --git a/modules/custom-css/csstidy/lang.inc.php b/modules/custom-css/csstidy/lang.inc.php
index be541cc639111..0a3ad0140cc7a 100644
--- a/modules/custom-css/csstidy/lang.inc.php
+++ b/modules/custom-css/csstidy/lang.inc.php
@@ -45,7 +45,7 @@
$lang['en'][2] = '(based on';
$lang['en'][3] = '(plaintext)';
$lang['en'][4] = 'Important Note:';
-$lang['en'][6] = 'Your code should be well-formed. This is not a validator which points out errors in your CSS code. To make sure that your code is valid, use the W3C Validator .';
+$lang['en'][6] = 'Your code should be well-formed. This is not a validator which points out errors in your CSS code. To make sure that your code is valid, use the W3C Validator .';
$lang['en'][7] = 'all comments are removed';
$lang['en'][8] = 'CSS Input:';
$lang['en'][9] = 'CSS-Code:';
@@ -112,7 +112,7 @@
$lang['de'][2] = '(basierend auf';
$lang['de'][3] = '(Textversion)';
$lang['de'][4] = 'Wichtiger Hinweis:';
-$lang['de'][6] = 'Der CSS Code sollte wohlgeformt sein. Der CSS Code wird nicht auf Gültigkeit überprüft . Um sicherzugehen dass dein Code valide ist, benutze den W3C Validierungsservice .';
+$lang['de'][6] = 'Der CSS Code sollte wohlgeformt sein. Der CSS Code wird nicht auf Gültigkeit überprüft . Um sicherzugehen dass dein Code valide ist, benutze den W3C Validierungsservice .';
$lang['de'][7] = 'alle Kommentare werden entfernt';
$lang['de'][8] = 'CSS Eingabe:';
$lang['de'][9] = 'CSS-Code:';
@@ -179,7 +179,7 @@
$lang['fr'][2] = '(basé sur ';
$lang['fr'][3] = '(Version texte)';
$lang['fr'][4] = 'Note Importante :';
-$lang['fr'][6] = 'Votre code doit être valide. Ce n’est pas un validateur qui signale les erreurs dans votre code CSS. Pour être sûr que votre code est correct, utilisez le validateur : W3C Validator .';
+$lang['fr'][6] = 'Votre code doit être valide. Ce n’est pas un validateur qui signale les erreurs dans votre code CSS. Pour être sûr que votre code est correct, utilisez le validateur : W3C Validator .';
$lang['fr'][7] = 'tous les commentaires sont enlevés';
$lang['fr'][8] = 'Champ CSS :';
$lang['fr'][9] = 'Code CSS :';
@@ -246,7 +246,7 @@
$lang['zh'][2] = '(使用';
$lang['zh'][3] = '(純文字)';
$lang['zh'][4] = '重要事項:';
-$lang['zh'][6] = '你的原始碼必須是良構的(well-formed). 這個工具沒有內建驗證器(validator) . 驗證器能夠指出你CSS原始碼裡的錯誤. 請使用 W3C 驗證器 , 確保你的原始碼合乎規範.';
+$lang['zh'][6] = '你的原始碼必須是良構的(well-formed). 這個工具沒有內建驗證器(validator) . 驗證器能夠指出你CSS原始碼裡的錯誤. 請使用 W3C 驗證器 , 確保你的原始碼合乎規範.';
$lang['zh'][7] = '所有註解都移除了';
$lang['zh'][8] = 'CSS 輸入:';
$lang['zh'][9] = 'CSS 原始碼:';
diff --git a/modules/custom-css/custom-css.php b/modules/custom-css/custom-css.php
index 28d142d33363c..068b1f0bacb49 100644
--- a/modules/custom-css/custom-css.php
+++ b/modules/custom-css/custom-css.php
@@ -634,7 +634,7 @@ static function get_css( $compressed = false ) {
apply_filters(
'safecss_default_css',
__(
- "Welcome to Custom CSS!\n\nTo learn how this works, see http://wp.me/PEmnE-Bt",
+ "Welcome to Custom CSS!\n\nTo learn how this works, see https://wp.me/PEmnE-Bt",
'jetpack'
)
)
@@ -1006,7 +1006,7 @@ static function admin() {
*
* @param string $str Intro text appearing above the Custom CSS editor.
*/
- echo apply_filters( 'safecss_intro_text', __( 'New to CSS? Start with a beginner tutorial . Questions?
+ echo apply_filters( 'safecss_intro_text', __( 'New to CSS? Start with a beginner tutorial . Questions?
Ask in the Themes and Templates forum .', 'jetpack' ) );
?>
diff --git a/modules/custom-post-types/comics.php b/modules/custom-post-types/comics.php
index ab8facd02b1ea..c67b1d97455b9 100644
--- a/modules/custom-post-types/comics.php
+++ b/modules/custom-post-types/comics.php
@@ -521,7 +521,7 @@ function comics_welcome_email( $welcome_email, $blog_id, $user_id, $password, $t
Your webcomic's new site is ready to go. Get started by setting your comic's title and tagline so your readers know what it's all about.
-Looking for more help with setting up your site? Check out the WordPress.com beginner's tutorial and the guide to comics on WordPress.com . Dive right in by publishing your first strip!
+Looking for more help with setting up your site? Check out the WordPress.com beginner's tutorial and the guide to comics on WordPress.com . Dive right in by publishing your first strip!
Lots of laughs,
The WordPress.com Team", 'jetpack' );
diff --git a/modules/subscriptions/views.php b/modules/subscriptions/views.php
index 380d2493ccc8e..fc578db4f10f7 100644
--- a/modules/subscriptions/views.php
+++ b/modules/subscriptions/views.php
@@ -164,7 +164,7 @@ static function render_widget_status_messages( $instance ) {
switch ( $_GET['blogsub'] ) {
case 'confirming':
echo "";
- _e( 'Thanks for subscribing! You’ll get an email with a link to confirm your subscription. If you don’t get it, please
contact us .' );
+ _e( 'Thanks for subscribing! You’ll get an email with a link to confirm your subscription. If you don’t get it, please
contact us .' );
echo "
";
break;
case 'blocked':
@@ -189,7 +189,7 @@ static function render_widget_status_messages( $instance ) {
break;
case 'pending':
echo "";
- _e( 'You have a pending subscription already; we just sent you another email. Click the link or
contact us if you don’t receive it.' );
+ _e( 'You have a pending subscription already; we just sent you another email. Click the link or
contact us if you don’t receive it.' );
echo "
";
break;
case 'confirmed':
From 73a16eb1f4f4f94586e8742b0249d1d7d082f610 Mon Sep 17 00:00:00 2001
From: Michael D Adams
Date: Thu, 22 Aug 2019 23:48:14 -0700
Subject: [PATCH 4/6] Switch to HTTPS for shortcodes and embeds.
---
modules/shortcodes/flickr.php | 7 ++-----
modules/shortcodes/googlemaps.php | 4 +---
modules/shortcodes/gravatar.php | 2 +-
modules/shortcodes/instagram.php | 7 +++----
modules/shortcodes/ted.php | 8 ++++----
modules/videopress/class.videopress-video.php | 5 +----
modules/videopress/shortcode.php | 2 +-
7 files changed, 13 insertions(+), 22 deletions(-)
diff --git a/modules/shortcodes/flickr.php b/modules/shortcodes/flickr.php
index 73db117203b79..9691a88a2a710 100644
--- a/modules/shortcodes/flickr.php
+++ b/modules/shortcodes/flickr.php
@@ -135,9 +135,7 @@ function flickr_shortcode_handler( $atts ) {
return '';
}
- if ( is_ssl() ) {
- $src = str_replace( 'http://', 'https://', $src );
- }
+ $src = str_replace( 'http://', 'https://', $src );
if ( 'video' === $showing ) {
@@ -186,7 +184,6 @@ function flickr_shortcode_handler( $atts ) {
*/
function flickr_shortcode_video_markup( $atts ) {
$atts = array_map( 'esc_attr', $atts );
- $http = ( is_ssl() ) ? 'https://' : 'http://';
$photo_vars = "photo_id=$atts[photo_id]";
if ( isset( $atts['secret'] ) ) {
@@ -194,7 +191,7 @@ function flickr_shortcode_video_markup( $atts ) {
}
return <<
+
EOD;
}
diff --git a/modules/shortcodes/googlemaps.php b/modules/shortcodes/googlemaps.php
index 435e8da0aa7b9..1871aff371f0f 100644
--- a/modules/shortcodes/googlemaps.php
+++ b/modules/shortcodes/googlemaps.php
@@ -108,9 +108,7 @@ function jetpack_googlemaps_shortcode( $atts ) {
}
$url = substr( $url, 0, -5 );
- if ( is_ssl() ) {
- $url = str_replace( 'http://', 'https://', $url );
- }
+ $url = str_replace( 'http://', 'https://', $url );
$css_class = 'googlemaps';
diff --git a/modules/shortcodes/gravatar.php b/modules/shortcodes/gravatar.php
index cb709af9d2c47..f84f1c2428092 100644
--- a/modules/shortcodes/gravatar.php
+++ b/modules/shortcodes/gravatar.php
@@ -94,7 +94,7 @@ function jetpack_gravatar_profile_shortcode( $atts ) {
}
// Render the shortcode.
- $gravatar_url = set_url_scheme( 'http://gravatar.com/' . $user->user_login );
+ $gravatar_url = 'https://gravatar.com/' . $user->user_login;
if ( defined( 'IS_WPCOM' ) && IS_WPCOM ) {
$avatar_url = wpcom_get_avatar_url( $user->ID, 96 );
diff --git a/modules/shortcodes/instagram.php b/modules/shortcodes/instagram.php
index 5a3280a5e2440..69a28a5e2a2c1 100644
--- a/modules/shortcodes/instagram.php
+++ b/modules/shortcodes/instagram.php
@@ -1,7 +1,4 @@
',
esc_url( $url ),
diff --git a/modules/shortcodes/ted.php b/modules/shortcodes/ted.php
index bbf093cf0b375..b26ef1da2736d 100644
--- a/modules/shortcodes/ted.php
+++ b/modules/shortcodes/ted.php
@@ -13,8 +13,8 @@
* @package Jetpack
*/
-wp_oembed_add_provider( '!https?://(www\.)?ted.com/talks/view/id/.+!i', 'http://www.ted.com/talks/oembed.json', true );
-wp_oembed_add_provider( '!https?://(www\.)?ted.com/talks/[a-zA-Z\-\_]+\.html!i', 'http://www.ted.com/talks/oembed.json', true );
+wp_oembed_add_provider( '!https?://(www\.)?ted.com/talks/view/id/.+!i', 'https://www.ted.com/talks/oembed.json', true );
+wp_oembed_add_provider( '!https?://(www\.)?ted.com/talks/[a-zA-Z\-\_]+\.html!i', 'https://www.ted.com/talks/oembed.json', true );
/**
* Get the unique ID of a TED video.
@@ -48,9 +48,9 @@ function shortcode_ted( $atts ) {
$url = '';
if ( preg_match( '#^[\d]+$#', $atts['id'], $matches ) ) {
- $url = 'http://ted.com/talks/view/id/' . $matches[0];
+ $url = 'https://ted.com/talks/view/id/' . $matches[0];
} elseif ( preg_match( '#^https?://(www\.)?ted\.com/talks/view/id/[0-9]+$#', $atts['id'], $matches ) ) {
- $url = $matches[0];
+ $url = set_url_scheme( $matches[0], 'https' );
}
unset( $atts['id'] );
diff --git a/modules/videopress/class.videopress-video.php b/modules/videopress/class.videopress-video.php
index a8c3a6b80491e..f75c1d6696a46 100644
--- a/modules/videopress/class.videopress-video.php
+++ b/modules/videopress/class.videopress-video.php
@@ -336,10 +336,7 @@ private function get_data() {
$request_params['maxwidth'] = $this->maxwidth;
}
- $url = 'http://videopress.com/data/wordpress.json';
- if ( is_ssl() ) {
- $url = 'https://v.wordpress.com/data/wordpress.json';
- }
+ $url = 'https://v.wordpress.com/data/wordpress.json';
$response = wp_remote_get(
add_query_arg( $request_params, $url ),
diff --git a/modules/videopress/shortcode.php b/modules/videopress/shortcode.php
index 30fe63bd2450f..a24bfaad815d5 100644
--- a/modules/videopress/shortcode.php
+++ b/modules/videopress/shortcode.php
@@ -13,7 +13,7 @@ class VideoPress_Shortcode {
protected function __construct() {
// By explicitly declaring the provider here, we can speed things up by not relying on oEmbed discovery.
- wp_oembed_add_provider( '#^https?://videopress.com/v/.*#', 'http://public-api.wordpress.com/oembed/1.0/', true );
+ wp_oembed_add_provider( '#^https?://videopress.com/v/.*#', 'https://public-api.wordpress.com/oembed/1.0/', true );
add_shortcode( 'videopress', array( $this, 'shortcode_callback' ) );
add_shortcode( 'wpvideo', array( $this, 'shortcode_callback' ) );
From 98b89c3eaf31351fb19669ccf28e46585e250258 Mon Sep 17 00:00:00 2001
From: Michael D Adams
Date: Thu, 22 Aug 2019 23:50:48 -0700
Subject: [PATCH 5/6] Switch to HTTPS: functional changes.
---
modules/comments/comments.php | 4 ++--
modules/minileven/minileven.php | 2 +-
modules/notes.php | 3 +--
modules/publicize/publicize.php | 4 ++--
modules/verification-tools/blog-verification-tools.php | 2 +-
sal/class.json-api-post-base.php | 4 ++--
6 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/modules/comments/comments.php b/modules/comments/comments.php
index bf1e4e874320e..3d8023fde47ab 100644
--- a/modules/comments/comments.php
+++ b/modules/comments/comments.php
@@ -302,7 +302,7 @@ public function comment_form_after() {
}
$params['sig'] = $signature;
- $url_origin = set_url_scheme( 'http://jetpack.wordpress.com' );
+ $url_origin = 'https://jetpack.wordpress.com';
$url = "{$url_origin}/jetpack-comment/?" . http_build_query( $params );
$url = "{$url}#parent=" . urlencode( set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] ) );
$this->signed_url = $url;
@@ -364,7 +364,7 @@ public function comment_form_after() {
* @since JetpackComments (1.4)
*/
public function watch_comment_parent() {
- $url_origin = set_url_scheme( 'http://jetpack.wordpress.com' );
+ $url_origin = 'https://jetpack.wordpress.com';
?>