summaryrefslogtreecommitdiff
path: root/program/include
diff options
context:
space:
mode:
Diffstat (limited to 'program/include')
-rw-r--r--program/include/rcmail_template.inc2
-rw-r--r--program/include/rcube_html.inc8
2 files changed, 5 insertions, 5 deletions
diff --git a/program/include/rcmail_template.inc b/program/include/rcmail_template.inc
index a3937c8d6..4acc717b8 100644
--- a/program/include/rcmail_template.inc
+++ b/program/include/rcmail_template.inc
@@ -345,7 +345,7 @@ class rcmail_template extends rcube_html_page
*/
function parse_with_globals($input)
{
- $GLOBALS['__comm_path'] = $GLOBALS['COMM_PATH'];
+ $GLOBALS['__comm_path'] = urlencode($GLOBALS['COMM_PATH']);
return preg_replace('/\$(__[a-z0-9_\-]+)/e', '$GLOBALS["\\1"]', $input);
}
diff --git a/program/include/rcube_html.inc b/program/include/rcube_html.inc
index 5ebfa3256..a31594a56 100644
--- a/program/include/rcube_html.inc
+++ b/program/include/rcube_html.inc
@@ -297,14 +297,14 @@ class rcube_form_element
$value = Q($value, 'strict', FALSE);
// attributes with no value
- if (in_array($key, array('checked', 'multiple', 'disabled', 'selected')))
+ if (in_array($key, array('checked', 'multiple', 'disabled', 'selected', 'nowrap')))
{
if ($value)
- $attrib_arr[] = $key;
+ $attrib_arr[] = sprintf('%s="%s"', $this->_conv_case($key, 'attrib'), $key);
}
// don't convert size of value attribute
else if ($key=='value')
- $attrib_arr[] = sprintf('%s="%s"', $this->_conv_case($key, 'attrib'), $value, 'value');
+ $attrib_arr[] = sprintf('%s="%s"', $this->_conv_case($key, 'attrib'), $value);
// regular tag attributes
else
@@ -647,7 +647,7 @@ class select extends rcube_form_element
$selected = ((isset($option['value']) &&
in_array($option['value'], $select, TRUE)) ||
(in_array($option['text'], $select, TRUE))) ?
- $this->_conv_case(' selected', 'attrib') : '';
+ $this->_conv_case(' selected="selected"', 'attrib') : '';
$options_str .= sprintf("<%s%s%s>%s</%s>\n",
$this->_conv_case('option', 'tag'),