Commit 612e79bd authored by Carsten  Rose's avatar Carsten Rose
Browse files

Merge branch '5382-tooltip-with-double-quotes' into 'master'

Bug #5382 - Double quotes in tooltips are now escaped with "

See merge request !38
parents 2393562a 26c5645e
......@@ -3348,7 +3348,7 @@ abstract class AbstractBuildForm {
// $formElement['editor-plugins']='autoresize code'
// $formElement['editor-contextmenu']='link image | cell row column'
$json = $this->getPrefixedElementsAsJSON(FE_EDITOR_PREFIX, $formElement);
$attribute .= Support::doAttribute('data-config', $json, true, ESCAPE_WITH_HTML_QUOTE);
$attribute .= Support::doAttribute('data-config', $json, true);
$attribute .= $this->getAttributeFeMode($formElement[FE_MODE]);
......
......@@ -153,10 +153,10 @@ class Support {
* @param bool $flagOmitEmpty
* @param string $modeEscape
*
* @return string correctly fomratted attribute. Space at the end.
* @return string correctly formatted attribute. Space at the end.
* @throws CodeException
*/
public static function doAttribute($type, $value, $flagOmitEmpty = true, $modeEscape = ESCAPE_WITH_BACKSLASH) {
public static function doAttribute($type, $value, $flagOmitEmpty = true, $modeEscape = ESCAPE_WITH_HTML_QUOTE) {
// several attributes might be given as an array - concat to a string
if (is_array($value)) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment