From 5e91c405b68f56ec27b55a0347d62da8a3bdfe9f Mon Sep 17 00:00:00 2001 From: Marco Date: Fri, 23 Aug 2019 21:12:50 +0200 Subject: [PATCH 1/3] FIX: Endless redirect loop on some subsites --- sso.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/sso.php b/sso.php index 74fcdca..0083223 100644 --- a/sso.php +++ b/sso.php @@ -73,13 +73,15 @@ function bootstrap() { */ function initialize_cookie_domain() { if ( empty( $GLOBALS['mercator_current_mapping'] ) ) { - return; - } + //return; + $cookie_domain = strtolower( wp_unslash( $_SERVER['HTTP_HOST'] ) ); + } else { + // Do the ms-settings dance, again. + $current_mapping = $GLOBALS['mercator_current_mapping']; - // Do the ms-settings dance, again. - $current_mapping = $GLOBALS['mercator_current_mapping']; + $cookie_domain = $current_mapping->get_domain(); + } - $cookie_domain = $current_mapping->get_domain(); if ( substr( $cookie_domain, 0, 4 ) === 'www.' ) { $cookie_domain = substr( $cookie_domain, 4 ); } From 3be9af3e5fa218b7e1f1e42b8b0fa9ece4fa7609 Mon Sep 17 00:00:00 2001 From: Marco Date: Wed, 2 Mar 2022 20:23:40 +0100 Subject: [PATCH 2/3] composer/installers removed --- composer.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 049e6e9..94974da 100644 --- a/composer.json +++ b/composer.json @@ -13,8 +13,5 @@ "homepage":"http://hmn.md/" } ], - "type": "wordpress-muplugin", - "require": { - "composer/installers": "~1.0" - } + "type": "wordpress-muplugin" } From 9c498b0c6c3e874c5d6d85fd1c68d3874880bcf5 Mon Sep 17 00:00:00 2001 From: Marco Date: Wed, 2 Mar 2022 20:36:28 +0100 Subject: [PATCH 3/3] composer installers v1 or v2 --- composer.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 94974da..31f9975 100644 --- a/composer.json +++ b/composer.json @@ -13,5 +13,8 @@ "homepage":"http://hmn.md/" } ], - "type": "wordpress-muplugin" + "type": "wordpress-muplugin", + "require": { + "composer/installers": "~1.0 || ~2.0" + } }