Fix html quoting in textareas

git-svn-id: https://svn.roundcube.net/trunk@1304 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 3 insertions, 3 deletions

diff --git a/roundcubemail/program/include/html.php b/roundcubemail/program/include/html.php
index 8af1b1f9d..e58c2b653 100644
--- a/roundcubemail/program/include/html.php
+++ b/roundcubemail/program/include/html.php
@@ -432,7 +432,7 @@ class html_textarea extends html
         }
 
         // take value attribute as content
-        if ($value == '') {
+        if (empty($value) && !empty($this->attrib['value'])) {
             $value = $this->attrib['value'];
         }
 
@@ -442,9 +442,9 @@ class html_textarea extends html
         }
 
         if (!empty($value) && !isset($this->attrib['mce_editable'])) {
-            $value = Q($value, 'strict', FALSE);
+            $value = Q($value, 'strict', false);
         }
-        return self::tag($this->tagname, $this->attrib, Q($value), array_merge(self::$common_attrib, $this->allowed_attrib));
+        return self::tag($this->tagname, $this->attrib, $value, array_merge(self::$common_attrib, $this->allowed_attrib));
     }
 }