tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

NEW Let shortcodes be disabled in HTMLText & HTMLVarchar

Browse Source
This commit is contained in:
Hamish Friedlander 2013-03-12 09:52:30 +13:00 committed by Sam Minnee
parent 252e6bce28
commit cd41a536b9
2 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
model/fieldtypes/HTMLText.php
View File

@ -11,7 +11,6 @@
* @subpackage model * @subpackage model
*/ */
class HTMLText extends Text { class HTMLText extends Text {
public static $escape_type = 'xml'; public static $escape_type = 'xml';
static $casting = array( static $casting = array(
@ -33,6 +32,16 @@ class HTMLText extends Text {
'NoHTML' => 'Text', 'NoHTML' => 'Text',
); );
protected $processShortcodes = true;
public function setOptions(array $options = array()) {
parent::setOptions($options);
if(array_key_exists("shortcodes", $options)) {
$this->processShortcodes = !!$options["shortcodes"];
}
}
/** /**
* Create a summary of the content. This will be some section of the first paragraph, limited by * Create a summary of the content. This will be some section of the first paragraph, limited by
* $maxWords. All internal tags are stripped out - the return value is a string * $maxWords. All internal tags are stripped out - the return value is a string
@ -133,7 +142,12 @@ class HTMLText extends Text {
} }
public function forTemplate() { public function forTemplate() {
return ShortcodeParser::get_active()->parse($this->value); if ($this->processShortcodes) {
return ShortcodeParser::get_active()->parse($this->value);
}
else {
return $this->value;
}
} }
/** /**

23
model/fieldtypes/HTMLVarchar.php
View File

@ -9,11 +9,26 @@
class HTMLVarchar extends Varchar { class HTMLVarchar extends Varchar {
public static $escape_type = 'xml'; public static $escape_type = 'xml';
public function forTemplate() { protected $processShortcodes = true;
return ShortcodeParser::get_active()->parse($this->value);
public function setOptions(array $options = array()) {
parent::setOptions($options);
if(array_key_exists("shortcodes", $options)) {
$this->processShortcodes = !!$options["shortcodes"];
}
} }
public function forTemplate() {
if ($this->processShortcodes) {
return ShortcodeParser::get_active()->parse($this->value);
}
else {
return $this->value;
}
}
public function exists() { public function exists() {
return parent::exists() && $this->value != '<p></p>'; return parent::exists() && $this->value != '<p></p>';
} }