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

Backports for Prado 3.2.4

1 files changed, 8 insertions, 10 deletions

diff --git a/framework/Web/UI/WebControls/TWebControl.php b/framework/Web/UI/WebControls/TWebControl.php
index 0da4d88c..e0bd6194 100644
--- a/framework/Web/UI/WebControls/TWebControl.php
+++ b/framework/Web/UI/WebControls/TWebControl.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.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: TWebControl.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -35,7 +34,6 @@ Prado::using('System.Web.UI.WebControls.TWebControlDecorator');
  * the body contents enclosed within the HTML tag.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TWebControl.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -45,12 +43,12 @@ class TWebControl extends TControl implements IStyleable
 	 *	@var boolean ensures the inclusion the id in the tag rendering.
 	 */
 	private $_ensureid=false;
-	
+
 	/**
 	 *	@var TWebControlDecorator this render things before and after both the open and close tag
 	 */
 	protected $_decorator;
-	
+
 
 	/**
 	 * Subclasses can override getEnsureId or just set this property.  eg. If your subclass
@@ -80,7 +78,7 @@ class TWebControl extends TControl implements IStyleable
 			$this->_decorator = Prado::createComponent('TWebControlDecorator', $this);
 		return $this->_decorator;
 	}
-	
+
 	/**
 	 * Copies basic control attributes from another control.
 	 * Properties including AccessKey, ToolTip, TabIndex, Enabled
@@ -397,10 +395,10 @@ class TWebControl extends TControl implements IStyleable
 	{
 		$this->getStyle()->setWidth($value);
 	}
-	
+
 
 	/**
-	 * If your subclass overrides the onPreRender method be sure to call 
+	 * If your subclass overrides the onPreRender method be sure to call
 	 * this method through parent::onPreRender($param); so your sub-class can be decorated,
 	 * among other things.
 	 * @param TEventParameter event parameter to be passed to the event handlers
@@ -408,7 +406,7 @@ class TWebControl extends TControl implements IStyleable
 	public function onPreRender($param) {
 		if($decorator = $this->getDecorator(false))
 			$decorator->instantiate();
-		
+
 		parent::onPreRender($param);
 	}
 
@@ -494,7 +492,7 @@ class TWebControl extends TControl implements IStyleable
 			$decorator->renderPostContentsText($writer);
 			$writer->renderEndTag();
 			$decorator->renderPostTagText($writer);
-		} else 
+		} else
 			$writer->renderEndTag($writer);
 	}
 }