Version 5.0.0 beta 2
This commit is contained in:
1 parent
15c7beabc5
commit
f61b0da85d
181 files changed
+3182
-1533
No files matched your search
@@ -154,13 +154,13 @@ class Field extends CustomField
|
||||
/* If we are using the "default" formatting, set that up now */
|
||||
$format = $this->format ?: "<strong data-i-el='title'>{\$title}:</strong><div data-i-el='value'>{\$processedContent}</div>";
|
||||
|
||||
return $this->parseHtmlLogic( $format, $value, $formattedValue, $member );
|
||||
return $this->parseHtmlLogic( $format, $value ?? '', $formattedValue, $member );
|
||||
|
||||
case ( static::PROFILE ):
|
||||
case ( static::PROFILE_COMPLETION ):
|
||||
if( $this->profile_format and !$bypassCustomFormatting )
|
||||
{
|
||||
return $this->parseHtmlLogic( $this->profile_format, $value, $formattedValue, $member );
|
||||
return $this->parseHtmlLogic( $this->profile_format, $value ?? '', $formattedValue, $member );
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -442,10 +442,10 @@ class Field extends CustomField
|
||||
$formatOptions = array( 'default' => 'custom_field_format_default', 'custom' => 'custom_field_format_custom' );
|
||||
$form->add( new Radio( 'pf_profile_format', $this->profile_format ? 'custom' : 'default', TRUE, array( 'options' => $formatOptions, 'toggles' => array( 'custom' => array( 'pf_profile_format_custom' ) ) ), NULL, NULL, NULL, 'pf_profile_format' ) );
|
||||
|
||||
$form->add( new TextArea( 'pf_profile_format_custom', $this->profile_format, FALSE, array( 'placeholder' => "<strong>{\$title}:</strong> {\$content}" ), NULL, NULL, NULL, 'pf_profile_format_custom' ) );
|
||||
$form->add( new TextArea( 'pf_profile_format_custom', $this->profile_format, null, array( 'placeholder' => "<strong>{\$title}:</strong> {\$content}" ), NULL, NULL, NULL, 'pf_profile_format_custom' ) );
|
||||
|
||||
$form->add( new Radio( 'pf_format', $this->format ? 'custom' : 'default', TRUE, array( 'options' => $formatOptions, 'toggles' => array( 'custom' => array( 'pf_format_custom' ) ) ), NULL, NULL, NULL, 'pf_format' ) );
|
||||
$form->add( new TextArea( 'pf_format_custom', $this->format, FALSE, array( 'placeholder' => "<strong>{\$title}:</strong> {\$content}" ), NULL, NULL, NULL, 'pf_format_custom' ) );
|
||||
$form->add( new TextArea( 'pf_format_custom', $this->format, null, array( 'placeholder' => "<strong>{\$title}:</strong> {\$content}" ), NULL, NULL, NULL, 'pf_format_custom' ) );
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in new issue
Block a user