From d6d61635befff8dd9e9847a2d2557700de4fcecd Mon Sep 17 00:00:00 2001 From: Eduard Briem Date: Fri, 4 Nov 2016 08:41:02 +1300 Subject: [PATCH 1/4] Enable Shortcode parsing for the Content in EditableLiteralField to be able to use internal links inside the HTMLEditorfield --- code/model/editableformfields/EditableLiteralField.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/model/editableformfields/EditableLiteralField.php b/code/model/editableformfields/EditableLiteralField.php index 9401fc5..7598d4a 100644 --- a/code/model/editableformfields/EditableLiteralField.php +++ b/code/model/editableformfields/EditableLiteralField.php @@ -145,7 +145,7 @@ class EditableLiteralField extends EditableFormField Convert::raw2htmlname($this->Name), Convert::raw2att($classes), $label, - $this->Content + ShortcodeParser::get_active()->parse($this->Content) ) ); From 184a433a15df3995a21ba29706646014eb0dbfe7 Mon Sep 17 00:00:00 2001 From: Eduard Briem Date: Mon, 7 Nov 2016 11:42:55 +1300 Subject: [PATCH 2/4] enable Shortcode parsing using $this->dbObject instead of manually invoking the shortcode parsers --- code/model/editableformfields/EditableLiteralField.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/model/editableformfields/EditableLiteralField.php b/code/model/editableformfields/EditableLiteralField.php index 7598d4a..7887937 100644 --- a/code/model/editableformfields/EditableLiteralField.php +++ b/code/model/editableformfields/EditableLiteralField.php @@ -145,7 +145,7 @@ class EditableLiteralField extends EditableFormField Convert::raw2htmlname($this->Name), Convert::raw2att($classes), $label, - ShortcodeParser::get_active()->parse($this->Content) + $this->dbObject('Content') ) ); From b1a4b4823fc37850da161d65640fa6f2c72e3abe Mon Sep 17 00:00:00 2001 From: Eduard Briem Date: Mon, 21 Nov 2016 09:20:46 +1300 Subject: [PATCH 3/4] force cast to string $this->dbObject('Content') in EditableLiteralField --- code/model/editableformfields/EditableLiteralField.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/model/editableformfields/EditableLiteralField.php b/code/model/editableformfields/EditableLiteralField.php index 7887937..41f3508 100644 --- a/code/model/editableformfields/EditableLiteralField.php +++ b/code/model/editableformfields/EditableLiteralField.php @@ -145,7 +145,7 @@ class EditableLiteralField extends EditableFormField Convert::raw2htmlname($this->Name), Convert::raw2att($classes), $label, - $this->dbObject('Content') + (string)$this->dbObject('Content') ) ); From c3ba8f42e1edb67b1a97dc4d704a9b8af983d35d Mon Sep 17 00:00:00 2001 From: Eduard Briem Date: Mon, 21 Nov 2016 10:48:10 +1300 Subject: [PATCH 4/4] using forTemplate() instead of (string) casting fixes unit test --- code/model/editableformfields/EditableLiteralField.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/model/editableformfields/EditableLiteralField.php b/code/model/editableformfields/EditableLiteralField.php index 41f3508..2c80277 100644 --- a/code/model/editableformfields/EditableLiteralField.php +++ b/code/model/editableformfields/EditableLiteralField.php @@ -145,7 +145,7 @@ class EditableLiteralField extends EditableFormField Convert::raw2htmlname($this->Name), Convert::raw2att($classes), $label, - (string)$this->dbObject('Content') + $this->dbObject('Content')->forTemplate() ) );