summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--HISTORY1
-rw-r--r--framework/TComponent.php6
2 files changed, 4 insertions, 3 deletions
diff --git a/HISTORY b/HISTORY
index a7b3f08e..aa993e7a 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2,6 +2,7 @@ Version 3.1.2 To be released
============================
BUG: Ticket#719 - TAutoCompleter should not trigger Validation if CausesValidation=False (Christophe)
BUG: Ticket#750 - The "expire" parameter is used inconsistently in cache modules (Qiang)
+BUG: Fixed a bug in TPropertyValue::ensureArray() (Qiang)
CHG: Changed TConditional so that the controls in its template behave like they are in its parent (Qiang)
CHG: Active Record many-to-many relationship change from self::HAS_MANY to self::MANY_TO_MANY (Wei)
CHG: Active Record no longer automatically performs adding/removing/updating related objects (Qiang)
diff --git a/framework/TComponent.php b/framework/TComponent.php
index 5a3cd2f2..1ac25c7f 100644
--- a/framework/TComponent.php
+++ b/framework/TComponent.php
@@ -578,11 +578,11 @@ class TPropertyValue
{
if(is_string($value))
{
- $trimmed = trim($value);
+ $value = trim($value);
$len = strlen($value);
- if ($len >= 2 && $trimmed[0] == '(' && $trimmed[$len-1] == ')')
+ if ($len >= 2 && $value[0] == '(' && $value[$len-1] == ')')
{
- eval('$array=array'.$trimmed.';');
+ eval('$array=array'.$value.';');
return $array;
}
else