From 7931eb5e47eaeac3e9a2910146caaf211c4a621e Mon Sep 17 00:00:00 2001 From: Bastian Allgeier Date: Fri, 1 Jul 2022 10:35:21 +0200 Subject: [PATCH] Upgrade to 3.7.0.2 --- kirby/composer.json | 2 +- kirby/composer.lock | 2 +- kirby/src/Http/Uri.php | 6 +++--- kirby/vendor/composer/installed.php | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/kirby/composer.json b/kirby/composer.json index 1560e17..494d130 100755 --- a/kirby/composer.json +++ b/kirby/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/kirby/composer.lock b/kirby/composer.lock index 5f02c7d..4e5b667 100755 --- a/kirby/composer.lock +++ b/kirby/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/kirby/src/Http/Uri.php b/kirby/src/Http/Uri.php index 48ad048..ebfb50b 100755 --- a/kirby/src/Http/Uri.php +++ b/kirby/src/Http/Uri.php @@ -244,12 +244,12 @@ class Uri } 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); } /** diff --git a/kirby/vendor/composer/installed.php b/kirby/vendor/composer/installed.php index 6191669..3342dd6 100755 --- a/kirby/vendor/composer/installed.php +++ b/kirby/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__ . '/../../',