summaryrefslogtreecommitdiff
path: root/framework/Testing/Data/ActiveRecord
diff options
context:
space:
mode:
authorctrlaltca@gmail.com <>2011-06-20 10:48:45 +0000
committerctrlaltca@gmail.com <>2011-06-20 10:48:45 +0000
commit656c339879a071f2f875831281ed833b876e4361 (patch)
treeb6f11d3ad8cb1f61b10b4e3b9fcb0a7d4d30f9e1 /framework/Testing/Data/ActiveRecord
parent0956370d34e2eefd0b5e556a6aaca6297ce1e3ce (diff)
removed useless calls to empty contructor; reverted some additional undocumented changes; upported the "cgi workaround" to trunk/; large (fake) changeset are due to mixed cr/crlf used previously
Diffstat (limited to 'framework/Testing/Data/ActiveRecord')
-rw-r--r--framework/Testing/Data/ActiveRecord/TActiveFinder.php1
-rw-r--r--framework/Testing/Data/ActiveRecord/TActiveRecord.php3
-rw-r--r--framework/Testing/Data/ActiveRecord/TActiveRecordCriteria.php1
3 files changed, 1 insertions, 4 deletions
diff --git a/framework/Testing/Data/ActiveRecord/TActiveFinder.php b/framework/Testing/Data/ActiveRecord/TActiveFinder.php
index 75787e77..d1c35bdf 100644
--- a/framework/Testing/Data/ActiveRecord/TActiveFinder.php
+++ b/framework/Testing/Data/ActiveRecord/TActiveFinder.php
@@ -47,7 +47,6 @@ class TActiveFinder extends TComponent
*/
public function __construct($model,$with,$criteria=null)
{
- parent::__construct();
$this->_criteria=$criteria;
$this->_builder=$model->getCommandBuilder();
$this->_joinTree=new TJoinElement($this,$model);
diff --git a/framework/Testing/Data/ActiveRecord/TActiveRecord.php b/framework/Testing/Data/ActiveRecord/TActiveRecord.php
index e1484f03..8d6c5e10 100644
--- a/framework/Testing/Data/ActiveRecord/TActiveRecord.php
+++ b/framework/Testing/Data/ActiveRecord/TActiveRecord.php
@@ -68,8 +68,7 @@ abstract class TActiveRecord extends TModel
{
if($scenario===null) // internally used by populateRecord() and model()
return;
-
- parent::__construct();
+
$this->setScenario($scenario);
$this->setIsNewRecord(true);
$this->_attributes=$this->getMetaData()->attributeDefaults;
diff --git a/framework/Testing/Data/ActiveRecord/TActiveRecordCriteria.php b/framework/Testing/Data/ActiveRecord/TActiveRecordCriteria.php
index 2a00cbda..46eddaf9 100644
--- a/framework/Testing/Data/ActiveRecord/TActiveRecordCriteria.php
+++ b/framework/Testing/Data/ActiveRecord/TActiveRecordCriteria.php
@@ -16,7 +16,6 @@ class TSqlCriteria extends TDbCriteria
public function __construct($condition=null, $parameters=array())
{
- parent::__construct();
if(!is_array($parameters) && func_num_args() > 1)
$parameters = array_slice(func_get_args(), 1);