diff --git a/core/ViewableData.php b/core/ViewableData.php index 6c66ce160..efa9920a4 100644 --- a/core/ViewableData.php +++ b/core/ViewableData.php @@ -114,7 +114,7 @@ class ViewableData extends Object implements IteratorAggregate { /** * Setter overloader. - * Allows default setting of fields in $this->setVal(), or mediation via a + * Allows default setting of fields in $this->setValue(), or mediation via a * getParamName() method. * @param string $field The field name. * @param mixed $val The field value. @@ -338,9 +338,9 @@ class ViewableData extends Object implements IteratorAggregate { if($constructor) { $fieldObj = eval($constructor); if($this->hasMethod('getAllFields')) { - $fieldObj->setVal($val, $this->getAllFields()); + $fieldObj->setValue($val, $this->getAllFields()); } else { - $fieldObj->setVal($val); + $fieldObj->setValue($val); } } } diff --git a/core/model/fieldtypes/DBField.php b/core/model/fieldtypes/DBField.php index bc7e3d720..d949e57ff 100644 --- a/core/model/fieldtypes/DBField.php +++ b/core/model/fieldtypes/DBField.php @@ -51,13 +51,6 @@ abstract class DBField extends ViewableData { return $dbField; } - /** - * @deprecated - */ - function setVal($value, $record = null) { - return $this->setValue($value, $record); - } - /** * Set the name of this field. * The name should never be altered, but it if was never given a name in the first place you can set a name. diff --git a/core/model/fieldtypes/Time.php b/core/model/fieldtypes/Time.php index 5e6f50de4..615432871 100755 --- a/core/model/fieldtypes/Time.php +++ b/core/model/fieldtypes/Time.php @@ -6,7 +6,7 @@ */ class Time extends DBField { - function setVal($value) { + function setValue($value) { if($value) { if(preg_match( '/(\d{1,2})[:.](\d{2})([ap]m)/', $value, $match )) $this->_12Hour( $match ); @@ -15,7 +15,7 @@ class Time extends DBField { } function setValue($value) { - return $this->setVal( $value ); + return $this->setValue( $value ); } function Nice() {