From e456367684194c38a7ba1ace7e0fc84d04fb304a Mon Sep 17 00:00:00 2001 From: Bastian Allgeier Date: Thu, 30 Jun 2022 12:10:24 +0200 Subject: [PATCH 1/2] Fix Uri::current() --- src/Http/Uri.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Http/Uri.php b/src/Http/Uri.php index 48ad048d93..ebfb50b68f 100644 --- a/src/Http/Uri.php +++ b/src/Http/Uri.php @@ -244,12 +244,12 @@ public static function current(array $props = []) } if ($app = App::instance(null, true)) { - $url = $app->url('current'); + $environment = $app->environment(); } else { - $url = (new Environment())->requestUrl(); + $environment = new Environment(); } - return new static($url, $props); + return new static($environment->requestUrl(), $props); } /** From b63a43975bfd3961fc10f7f85a90789ca55deffe Mon Sep 17 00:00:00 2001 From: Bastian Allgeier Date: Thu, 30 Jun 2022 12:13:41 +0200 Subject: [PATCH 2/2] Update composer --- composer.json | 2 +- composer.lock | 2 +- vendor/composer/installed.php | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 1560e17a2b..494d1302e6 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "description": "The Kirby 3 core", "license": "proprietary", "type": "kirby-cms", - "version": "3.7.0.1", + "version": "3.7.0.2", "keywords": [ "kirby", "cms", diff --git a/composer.lock b/composer.lock index 5f02c7d812..4e5b667340 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "524d8e1f0eb06eade0d9aebfa855d848", + "content-hash": "538cd92719a152cbecaaaec5cde21f03", "packages": [ { "name": "claviska/simpleimage", diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index 61916696b7..3342dd63ab 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -1,8 +1,8 @@ array( 'name' => 'getkirby/cms', - 'pretty_version' => '3.7.0.1', - 'version' => '3.7.0.1', + 'pretty_version' => '3.7.0.2', + 'version' => '3.7.0.2', 'reference' => NULL, 'type' => 'kirby-cms', 'install_path' => __DIR__ . '/../../', @@ -29,8 +29,8 @@ 'dev_requirement' => false, ), 'getkirby/cms' => array( - 'pretty_version' => '3.7.0.1', - 'version' => '3.7.0.1', + 'pretty_version' => '3.7.0.2', + 'version' => '3.7.0.2', 'reference' => NULL, 'type' => 'kirby-cms', 'install_path' => __DIR__ . '/../../',