From 6bc8dcc8c5c7f6bdd3e053b63b886d49d1b312ec Mon Sep 17 00:00:00 2001 From: Nico Hoffmann Date: Tue, 28 Nov 2023 18:28:03 +0800 Subject: [PATCH 1/2] Clean up search fix --- site/plugins/search/src/Search.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/site/plugins/search/src/Search.php b/site/plugins/search/src/Search.php index cfdaf95a8a..4387d90cd3 100644 --- a/site/plugins/search/src/Search.php +++ b/site/plugins/search/src/Search.php @@ -24,16 +24,17 @@ class Search public function __construct() { $this->options = App::instance()->option('search.algolia', []); - $this->options['key'] = App::instance()->option('keys.algolia'); if (isset($this->options['app']) === false) { throw new Exception('Please set your Algolia API credentials in the Kirby configuration.'); } + // use the search-only API key as fallback + $this->options['key'] = App::instance()->option('keys.algolia', 'd161a2f4cd2d69247c529a3371ad3050'); + $this->algolia = Algolia::create( $this->options['app'], - // use the search-only API key as fallback - option('keys.algolia', 'd161a2f4cd2d69247c529a3371ad3050') + $this->options['key'] ); } From 4bf867c7b13be248d3338bd29935bc3ae0c07c5f Mon Sep 17 00:00:00 2001 From: Ahmet Bora Date: Tue, 28 Nov 2023 13:13:47 +0300 Subject: [PATCH 2/2] Plugin v4 compatibilities --- content/plugins/thathoff/clear-cloudflare-cache/plugin.txt | 4 ++-- content/plugins/tobimori/blurhash/plugin.txt | 4 ++-- content/plugins/tobimori/magick-extended/plugin.txt | 4 ++-- content/plugins/tobimori/tailwind-merge/plugin.txt | 2 +- content/plugins/tobimori/thumbhash/plugin.txt | 4 ++-- content/plugins/wearejust/meta-tags/plugin.txt | 4 ++-- content/plugins/werbschaft/upload-extended/plugin.txt | 4 ++-- content/plugins/ww/merx/plugin.txt | 4 ++-- content/plugins/zephir/contentsync/plugin.txt | 4 ++-- content/plugins/zephir/cookieconsent/plugin.txt | 4 ++-- 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/content/plugins/thathoff/clear-cloudflare-cache/plugin.txt b/content/plugins/thathoff/clear-cloudflare-cache/plugin.txt index 30a7c29dc5..18242af953 100644 --- a/content/plugins/thathoff/clear-cloudflare-cache/plugin.txt +++ b/content/plugins/thathoff/clear-cloudflare-cache/plugin.txt @@ -2,7 +2,7 @@ Title: Clear Cloudflare Cache ---- -Text: +Text: ---- @@ -22,4 +22,4 @@ Description: Automatically purge Cloudflare cached URLs ---- -Versions: 3 \ No newline at end of file +Versions: 3,4 diff --git a/content/plugins/tobimori/blurhash/plugin.txt b/content/plugins/tobimori/blurhash/plugin.txt index 5c8a306cc7..575f5a4826 100644 --- a/content/plugins/tobimori/blurhash/plugin.txt +++ b/content/plugins/tobimori/blurhash/plugin.txt @@ -2,7 +2,7 @@ Title: BlurHash ---- -Text: +Text: ---- @@ -26,4 +26,4 @@ Published: 2023-01-07 ---- -Versions: 3 \ No newline at end of file +Versions: 3,4 diff --git a/content/plugins/tobimori/magick-extended/plugin.txt b/content/plugins/tobimori/magick-extended/plugin.txt index 38d6d11bbd..d0a02dd1ba 100644 --- a/content/plugins/tobimori/magick-extended/plugin.txt +++ b/content/plugins/tobimori/magick-extended/plugin.txt @@ -2,7 +2,7 @@ Title: ImageMagick Extended ---- -Text: +Text: ---- @@ -26,4 +26,4 @@ Description: Extend Kirby's built-in ImageMagick driver, work better with GIFs a ---- -Versions: 3 \ No newline at end of file +Versions: 3,4 diff --git a/content/plugins/tobimori/tailwind-merge/plugin.txt b/content/plugins/tobimori/tailwind-merge/plugin.txt index 4a680a0b22..aed0ca3895 100644 --- a/content/plugins/tobimori/tailwind-merge/plugin.txt +++ b/content/plugins/tobimori/tailwind-merge/plugin.txt @@ -114,4 +114,4 @@ Example: ---- -Versions: 3 \ No newline at end of file +Versions: 3,4 diff --git a/content/plugins/tobimori/thumbhash/plugin.txt b/content/plugins/tobimori/thumbhash/plugin.txt index 3c678ef9ad..2962ff04bb 100644 --- a/content/plugins/tobimori/thumbhash/plugin.txt +++ b/content/plugins/tobimori/thumbhash/plugin.txt @@ -2,7 +2,7 @@ Title: ThumbHash ---- -Text: +Text: ---- @@ -26,4 +26,4 @@ Published: 2023-05-07 ---- -Versions: 3 \ No newline at end of file +Versions: 3,4 diff --git a/content/plugins/wearejust/meta-tags/plugin.txt b/content/plugins/wearejust/meta-tags/plugin.txt index e20ebdfdea..d1bc65810f 100644 --- a/content/plugins/wearejust/meta-tags/plugin.txt +++ b/content/plugins/wearejust/meta-tags/plugin.txt @@ -2,7 +2,7 @@ Title: Meta Tags ---- -Text: +Text: ---- @@ -35,4 +35,4 @@ Example: ---- -Versions: 3 \ No newline at end of file +Versions: 3,4 diff --git a/content/plugins/werbschaft/upload-extended/plugin.txt b/content/plugins/werbschaft/upload-extended/plugin.txt index 8566ff82cd..8ed9f5baca 100644 --- a/content/plugins/werbschaft/upload-extended/plugin.txt +++ b/content/plugins/werbschaft/upload-extended/plugin.txt @@ -2,7 +2,7 @@ Title: Upload Extended ---- -Text: +Text: ---- @@ -36,4 +36,4 @@ return [ ---- -Versions: 3 \ No newline at end of file +Versions: 3,4 diff --git a/content/plugins/ww/merx/plugin.txt b/content/plugins/ww/merx/plugin.txt index 4432f5c6d6..1276cba86d 100644 --- a/content/plugins/ww/merx/plugin.txt +++ b/content/plugins/ww/merx/plugin.txt @@ -2,7 +2,7 @@ Title: Merx ---- -Text: +Text: ---- @@ -22,4 +22,4 @@ Description: A powerful toolkit to cre­ate your very own on­line shop. Start e ---- -Versions: 3 \ No newline at end of file +Versions: 3,4 diff --git a/content/plugins/zephir/contentsync/plugin.txt b/content/plugins/zephir/contentsync/plugin.txt index 8e9ba61b3e..6a4bed4a2a 100644 --- a/content/plugins/zephir/contentsync/plugin.txt +++ b/content/plugins/zephir/contentsync/plugin.txt @@ -2,7 +2,7 @@ Title: Contentsync ---- -Text: +Text: ---- @@ -26,4 +26,4 @@ Published: 2023-07-18 ---- -Versions: 3 \ No newline at end of file +Versions: 3,4 diff --git a/content/plugins/zephir/cookieconsent/plugin.txt b/content/plugins/zephir/cookieconsent/plugin.txt index 2e36ec0fe8..b515b38c15 100644 --- a/content/plugins/zephir/cookieconsent/plugin.txt +++ b/content/plugins/zephir/cookieconsent/plugin.txt @@ -2,7 +2,7 @@ Title: Cookieconsent ---- -Text: +Text: ---- @@ -30,4 +30,4 @@ Published: 2023-07-11 ---- -Versions: 3 \ No newline at end of file +Versions: 3,4