projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #2547 from davecivicrm/CRM-14249
[civicrm-core.git]
/
CRM
/
Utils
/
String.php
diff --git
a/CRM/Utils/String.php
b/CRM/Utils/String.php
index 257c0374d706cfddf9a7aa763c8ca20c0353a7c7..eaae593b46e6551f6696784e259f9266479946e9 100644
(file)
--- a/
CRM/Utils/String.php
+++ b/
CRM/Utils/String.php
@@
-402,7
+402,7
@@
class CRM_Utils_String {
/**
* Convert a HTML string into a text one using html2text
*
/**
* Convert a HTML string into a text one using html2text
*
- * @param string $html the tring to be converted
+ * @param string $html the
s
tring to be converted
*
* @return string the converted string
* @access public
*
* @return string the converted string
* @access public
@@
-410,8
+410,11
@@
class CRM_Utils_String {
*/
static function htmlToText($html) {
require_once 'packages/html2text/rcube_html2text.php';
*/
static function htmlToText($html) {
require_once 'packages/html2text/rcube_html2text.php';
- $converter = new rcube_html2text($html);
- return $converter->get_text();
+ $token_html = preg_replace('!\{([a-z_.]+)\}!i', 'token:{$1}', $html);
+ $converter = new rcube_html2text($token_html);
+ $token_text = $converter->get_text();
+ $text = preg_replace('!token\:\{([a-z_.]+)\}!i', '{$1}', $token_text);
+ return $text;
}
static function extractName($string, &$params) {
}
static function extractName($string, &$params) {