From d64fdce7fe5696d4e19cd738417b276dff79a1cf Mon Sep 17 00:00:00 2001 From: ale <ale@incal.net> Date: Sat, 30 Apr 2022 19:00:09 +0100 Subject: [PATCH] Remove unused Buddypress patches --- composer.patches.json | 4 --- .../buddypress/0053-Patch-buddypress.patch | 14 -------- ...d-https-on-buddypress-login-redirect.patch | 36 ------------------- 3 files changed, 54 deletions(-) delete mode 100644 patches/buddypress/0053-Patch-buddypress.patch delete mode 100644 patches/buddypress/0147-forced-https-on-buddypress-login-redirect.patch diff --git a/composer.patches.json b/composer.patches.json index c32112d2..1fce0ac4 100644 --- a/composer.patches.json +++ b/composer.patches.json @@ -19,10 +19,6 @@ "wpackagist-plugin/creative-commons-license-widget": { "Remove hotlinking of images": "patches/plugins/creative-commons-license.patch" }, - "wpackagist-plugin/buddypress": { - "Disable gravatar": "patches/buddypress/0053-Patch-buddypress.patch", - "Force https on buddypress login redirect": "patches/buddypress/0147-forced-https-on-buddypress-login-redirect.patch" - }, "wpackagist-plugin/wp-piwik": { "Disable Piwik global updates": "patches/plugins/wp-piwik.patch" }, diff --git a/patches/buddypress/0053-Patch-buddypress.patch b/patches/buddypress/0053-Patch-buddypress.patch deleted file mode 100644 index 6ecb2b49..00000000 --- a/patches/buddypress/0053-Patch-buddypress.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/bp-core/bp-core-avatars.php -+++ b/bp-core/bp-core-avatars.php -@@ -209,7 +209,7 @@ - 'css_id' => false, - 'alt' => '', - 'email' => false, -- 'no_grav' => null, -+ 'no_grav' => true, - 'html' => true, - 'title' => '', - 'extra_attr' => '', - - - \ No newline at end of file diff --git a/patches/buddypress/0147-forced-https-on-buddypress-login-redirect.patch b/patches/buddypress/0147-forced-https-on-buddypress-login-redirect.patch deleted file mode 100644 index 29f034a5..00000000 --- a/patches/buddypress/0147-forced-https-on-buddypress-login-redirect.patch +++ /dev/null @@ -1,36 +0,0 @@ -From a567c1ac1d684c335aea25c706b9cab6f2c9f4d7 Mon Sep 17 00:00:00 2001 -From: lechuck <l3chuck@autistici.org> -Date: Wed, 3 Oct 2012 10:42:29 +0000 -Subject: [PATCH 147/229] forced https on buddypress login redirect - ---- - wp-content/plugins/buddypress/bp-core/bp-core-filters.php | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/wp-content/plugins/buddypress/bp-core/bp-core-filters.php b/wp-content/plugins/buddypress/bp-core/bp-core-filters.php -index adc38a5a..a95b1a85 100644 ---- a/wp-content/plugins/buddypress/bp-core/bp-core-filters.php -+++ b/wp-content/plugins/buddypress/bp-core/bp-core-filters.php -@@ -327,7 +327,7 @@ function bp_core_login_redirect( $redirect_to, $redirect_to_raw, $user ) { - } - - if ( false === strpos( wp_get_referer(), 'wp-login.php' ) && false === strpos( wp_get_referer(), 'activate' ) && empty( $_REQUEST['nr'] ) ) { -- return wp_get_referer(); -+ return str_replace('http://', 'https://', wp_get_referer()); - } - - /** -@@ -337,8 +337,9 @@ function bp_core_login_redirect( $redirect_to, $redirect_to_raw, $user ) { - * - * @param string $value URL to redirect to. - */ -- return apply_filters( 'bp_core_login_redirect_to', bp_get_root_domain() ); -+ return str_replace('http://', 'https://', bp_get_root_domain()); - } -+ - add_filter( 'bp_login_redirect', 'bp_core_login_redirect', 10, 3 ); - - /** --- -2.17.1 - -- GitLab