From 5d02ac2219c95459afb8f7dc7a0457b5c0e98fd0 Mon Sep 17 00:00:00 2001 From: xue <> Date: Thu, 20 Apr 2006 17:06:59 +0000 Subject: Fixed #138 and an error in HTML entity representation for double quotes. --- framework/Web/THttpUtility.php | 4 ++-- framework/Web/UI/WebControls/THtmlArea.php | 9 ++++++++- framework/Web/UI/WebControls/TTableRow.php | 3 ++- 3 files changed, 12 insertions(+), 4 deletions(-) (limited to 'framework/Web') diff --git a/framework/Web/THttpUtility.php b/framework/Web/THttpUtility.php index 4cd869b4..3bb78f0f 100644 --- a/framework/Web/THttpUtility.php +++ b/framework/Web/THttpUtility.php @@ -20,8 +20,8 @@ */ class THttpUtility { - private static $_encodeTable=array('<'=>'<','>'=>'>','"'=>'"e;'); - private static $_decodeTable=array('<'=>'<','>'=>'>','"e;'=>'"'); + private static $_encodeTable=array('<'=>'<','>'=>'>','"'=>'"'); + private static $_decodeTable=array('<'=>'<','>'=>'>','"'=>'"'); /** * HTML-encodes a string. diff --git a/framework/Web/UI/WebControls/THtmlArea.php b/framework/Web/UI/WebControls/THtmlArea.php index 7ad2d06f..038c7368 100644 --- a/framework/Web/UI/WebControls/THtmlArea.php +++ b/framework/Web/UI/WebControls/THtmlArea.php @@ -10,6 +10,11 @@ * @package System.Web.UI */ +/** + * Includes TTextBox class + */ +Prado::using('System.Web.UI.WebControls.TTextBox'); + /** * THtmlArea class * @@ -73,7 +78,8 @@ */ class THtmlArea extends TTextBox { - protected $langs = array( + // Qiang: need to clean up the following (too inefficient) + private $langs = array( 'da' => array('da'), 'fa' => array('fa'), 'hu' => array('hu'), @@ -310,6 +316,7 @@ class THtmlArea extends TTextBox if(count($variants) == 0) $variants[] = empty($culture) ? 'en' : strtolower($culture); + // TODO: triple loops??? foreach($this->langs as $js => $langs) { foreach($variants as $variant) diff --git a/framework/Web/UI/WebControls/TTableRow.php b/framework/Web/UI/WebControls/TTableRow.php index 04a1555d..6a3f196a 100644 --- a/framework/Web/UI/WebControls/TTableRow.php +++ b/framework/Web/UI/WebControls/TTableRow.php @@ -11,9 +11,10 @@ */ /** - * Includes TTableCell class + * Includes TTableCell and TTableHeaderCell classes */ Prado::using('System.Web.UI.WebControls.TTableCell'); +Prado::using('System.Web.UI.WebControls.TTableHeaderCell'); /** * TTableRow class. -- cgit v1.2.3