Fix issue where $field was sent instead of $options, resulting in an error with array_merge

romaincazier · romaincazier · commit c4e1e5d72436 · 2023-04-10T23:02:59.000+02:00
diff --git a/TextformatterFootnotes.info.php b/TextformatterFootnotes.info.php
@@ -2,7 +2,7 @@
 
 $info = [
 	"title" => "Footnotes",
-	"version" => "0.0.2",
+	"version" => "0.0.3",
 	"summary" => "Adds footnotes using Markdown Extra’s syntax, minus Markdown",
 	"author" => "EPRC",
 	"href" => "https://github.com/eprcstudio/TextformatterFootnotes",
diff --git a/TextformatterFootnotes.module.php b/TextformatterFootnotes.module.php
@@ -41,7 +41,7 @@ public function format(&$str) {
 	}
 	
 	public function formatValue(Page $page, Field $field, &$value) {
-		$value = $this->addFootnotes($value, $field);
+		$value = $this->addFootnotes($value, [], $field);
 	}
 
 	/**
@@ -72,6 +72,7 @@ public function formatValue(Page $page, Field $field, &$value) {
 	 */
 	public function ___addFootnotes($str, $options = [], $field = "") {
 		if(!$str) return "";
+		if(!is_array($options)) $options = [];
 		$defaultOptions = [
 			"tag" => "div",
 			"icon" => $this->icon,

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public function format(&$str) {`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`public function formatValue(Page $page, Field $field, &$value) {`
`44`		`- $value = $this->addFootnotes($value, $field);`
	`44`	`+ $value = $this->addFootnotes($value, [], $field);`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`/**`
`@@ -72,6 +72,7 @@ public function formatValue(Page $page, Field $field, &$value) {`
`72`	`72`	`*/`
`73`	`73`	`public function ___addFootnotes($str, $options = [], $field = "") {`
`74`	`74`	`if(!$str) return "";`
	`75`	`+ if(!is_array($options)) $options = [];`
`75`	`76`	`$defaultOptions = [`
`76`	`77`	`"tag" => "div",`
`77`	`78`	`"icon" => $this->icon,`