Merge pull request #4450 from getkirby/release/3.7.0.2

3.7.0.2
getkirby · Jul 1, 2022 · 9e89103 · 9e89103
2 parents d57e2b5 + b63a439
commit 9e89103
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git 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
diff --git 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);
     }
 
     /**

diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
@@ -1,8 +1,8 @@
 <?php return array(
     'root' => 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__ . '/../../',