Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed #6131 - Issue with DetailView of Email module on 7.10.7 xampp #6194

Merged
merged 2 commits into from Aug 30, 2018
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
52 changes: 52 additions & 0 deletions include/SugarFields/Fields/EmailBody/SugarFieldEmailBody.php
Expand Up @@ -64,4 +64,56 @@ public function getDetailViewSmarty($parentFieldArray, $vardef, $displayParams,

return $this->fetch($this->findTemplate('DetailView'));
}

/**
* @param string $parentFieldArray
* @param array $vardef
* @param array $displayParams
* @param integer $tabindex
* @return string
*/
public function getEditViewSmarty($parentFieldArray, $vardef, $displayParams, $tabindex)
{
$sugarCleaner = new SugarCleaner();
$vardef['value'] = $sugarCleaner::cleanHtml($this->getVardefValue($vardef));

$this->setup($parentFieldArray, $vardef, $displayParams, $tabindex);

return $this->fetch($this->findTemplate('EditView'));
}

/**
* @param string $parentFieldArray
* @param array $vardef
* @param array $displayParams
* @param integer $tabindex
* @return string
*/
public function getSearchViewSmarty($parentFieldArray, $vardef, $displayParams, $tabindex)
{
$sugarCleaner = new SugarCleaner();
$vardef['value'] = $sugarCleaner::cleanHtml($this->getVardefValue($vardef));

$this->setup($parentFieldArray, $vardef, $displayParams, $tabindex);

return $this->fetch($this->findTemplate('DetailView'));
}

/**
* @param array $vardef
* @return mixed
*/
private function getVardefValue($vardef)
{
if (empty($vardef['value'])) {
if (!empty($vardef['default'])) {
return $vardef['default'];
} elseif (!empty($vardef['default_value'])) {
return $vardef['default_value'];
}
LoggerManager::getLogger()->warn('Vardef has no value');
}

return utf8_decode($vardef['value']);
}
}