Merge branch 'main' of github.com:getkirby/getkirby.com

getkirby · Nov 28, 2023 · b17fe81 · b17fe81
2 parents 9d027b1 + 4bf867c
commit b17fe81
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 22 deletions.
diff --git 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
+Versions: 3,4
diff --git 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
+Versions: 3,4
diff --git 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
+Versions: 3,4
diff --git a/content/plugins/tobimori/tailwind-merge/plugin.txt b/content/plugins/tobimori/tailwind-merge/plugin.txt
@@ -114,4 +114,4 @@ Example:
 
 ----
 
-Versions: 3
+Versions: 3,4
diff --git 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
+Versions: 3,4
diff --git 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
+Versions: 3,4
diff --git 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
+Versions: 3,4
diff --git 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 create your very own online shop. Start e
 
 ----
 
-Versions: 3
+Versions: 3,4
diff --git 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
+Versions: 3,4
diff --git 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
+Versions: 3,4
diff --git 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']
 		);
 	}
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ Title: Clear Cloudflare Cache @@
     ----
-    Text:
+    Text:
     ----
@@ Expand All / @@ -22,4 +22,4 @@ Description: Automatically purge Cloudflare cached URLs @@
     ----
-    Versions: 3
+    Versions: 3,4
Original file line number	Diff line number	Diff line change
Expand Up		@@ -114,4 +114,4 @@ Example:

		----

		Versions: 3
		Versions: 3,4