Merge pull request #530 from pradosoft/prado-3.2.43.2.4prado-3.2

Backports for Prado 3.2.4

1 files changed, 10 insertions, 5 deletions

diff --git a/framework/Web/UI/WebControls/THtmlArea4.php b/framework/Web/UI/WebControls/THtmlArea4.php
index f98c2ddf..d5410eae 100644
--- a/framework/Web/UI/WebControls/THtmlArea4.php
+++ b/framework/Web/UI/WebControls/THtmlArea4.php
@@ -4,9 +4,8 @@
  *
  * @author Fabio Bas <ctrlaltca[at]gmail[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: THtmlArea4.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -20,7 +19,7 @@ Prado::using('System.Web.UI.WebControls.TTextBox');
  *
  * THtmlArea4 wraps the visual editing functionalities provided by the
  * version 4 of TinyMCE project {@link http://tinymce.com/}. It has been
- * developed as a plug'n'play substitute for {@link THtmlArea}, that is 
+ * developed as a plug'n'play substitute for {@link THtmlArea}, that is
  * based on the previous iteration (version 3) of the same project.
  * Please note that both components can't be used together in the same page.
  *
@@ -53,7 +52,6 @@ Prado::using('System.Web.UI.WebControls.TTextBox');
  * </code>
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: THtmlArea.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -408,6 +406,13 @@ class THtmlArea4 extends TTextBox
 		$options['height'] = $this->getHeight();
 		$options['resize'] = 'both';
 		$options['menubar'] = false;
+		if($this->getReadOnly())
+		{
+			$options['readonly'] = true;
+			$options['toolbar'] = false;
+			$options['menubar'] = false;
+			$options['statusbar'] = false;
+		}
 
 		$options['extended_valid_elements'] = 'a[name|href|target|title|onclick],img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name],hr[class|width|size|noshade],font[face|size|color|style],span[class|align|style]';
 
@@ -430,7 +435,7 @@ class THtmlArea4 extends TTextBox
 			if(count($option) == 2)
 			{
 				$value=trim(trim($option[1]),"'\"");
-				if (($s=strtolower($value))==='false') 
+				if (($s=strtolower($value))==='false')
 					$value=false;
 				elseif ($s==='true')
 					$value=true;