Feature/issue 19 subfolder installation (#21)

* fix: #19 slug detection for subfolder installations
mauricerenck · Aug 20, 2021 · cf09bc1 · cf09bc1
1 parent 0c717b9
commit cf09bc1
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 10 deletions.
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
   "name": "mauricerenck/komments",
-  "version": "0.10.4",
+  "version": "0.10.5",
   "description": "A comment and webmention plugin for Kirby 3",
   "type": "kirby-plugin",
   "license": "MIT",

diff --git a/composer.lock b/composer.lock
diff --git a/index.js b/index.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "komments",
-  "version": "0.10.4",
+  "version": "0.10.5",
   "description": "A comment and webmention plugin for Kirby 3",
   "main": "index.js",
   "author": "Maurice Renck",

diff --git a/utils/receiveKomment.php b/utils/receiveKomment.php
@@ -2,7 +2,6 @@
 
 namespace mauricerenck\Komments;
 
-use Kirby\Http\Url;
 use Kirby\Toolkit\V;
 use Kirby\Toolkit\Str;
 use Kirby\Data\yaml;
@@ -46,7 +45,9 @@ public function createKomment($webmention, $spamlevel = 0, $isVerified = false)
     public function getPageFromUrl(string $url)
     {
         if (V::url($url)) {
-            $path = Url::path($url);
+            // use kirby->url because it includes the path of a possible subfolder install
+            $kirbyBaseUrl = kirby()->url();
+            $path = substr($url, strlen($kirbyBaseUrl));
             $languages = kirby()->languages();
 
             if (empty($path)) {

diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
@@ -1,7 +1,7 @@
 <?php return array(
     'root' => array(
-        'pretty_version' => '0.10.4',
-        'version' => '0.10.4.0',
+        'pretty_version' => '0.10.5',
+        'version' => '0.10.5.0',
         'type' => 'kirby-plugin',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -29,8 +29,8 @@
             'dev_requirement' => false,
         ),
         'mauricerenck/komments' => array(
-            'pretty_version' => '0.10.4',
-            'version' => '0.10.4.0',
+            'pretty_version' => '0.10.5',
+            'version' => '0.10.5.0',
             'type' => 'kirby-plugin',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),