RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2024-12-13 06:46:03 +03:00
Code Issues Projects Releases Wiki Activity

fixes #717

Browse Source
This commit is contained in:
jwage 2008-01-22 23:50:32 +00:00
parent f9ee88a5c3
commit 4e522ebf6b
2 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/Doctrine/Template/Listener/Timestampable.php
View File

@ -38,7 +38,7 @@ class Doctrine_Template_Listener_Timestampable extends Doctrine_Record_Listener
* @var string
*/
protected $_options = array();
/**
* __construct
*
@ -49,7 +49,7 @@ class Doctrine_Template_Listener_Timestampable extends Doctrine_Record_Listener
{
$this->_options = $options;
}
/**
* preInsert
*
@ -68,7 +68,7 @@ class Doctrine_Template_Listener_Timestampable extends Doctrine_Record_Listener
$event->getInvoker()->$updatedName = $this->getTimestamp('updated');
}
}
/**
* preUpdate
*
@ -82,7 +82,7 @@ class Doctrine_Template_Listener_Timestampable extends Doctrine_Record_Listener
$event->getInvoker()->$updatedName = $this->getTimestamp('updated');
}
}
/**
* getTimestamp
*
@ -94,13 +94,17 @@ class Doctrine_Template_Listener_Timestampable extends Doctrine_Record_Listener
public function getTimestamp($type)
{
$options = $this->_options[$type];
if ($options['type'] == 'date') {
return date($options['format'], time());
} else if ($options['type'] == 'timestamp') {
return date($options['format'], time());
if ($options['expression'] !== false && is_string($options['expression'])) {
return new Doctrine_Expression($options['expression']);
} else {
return time();
if ($options['type'] == 'date') {
return date($options['format'], time());
} else if ($options['type'] == 'timestamp') {
return date($options['format'], time());
} else {
return time();
}
}
}
}

26
lib/Doctrine/Template/Timestampable.php
View File

@ -39,17 +39,19 @@ class Doctrine_Template_Timestampable extends Doctrine_Template
*
* @var string
*/
protected $_options = array('created' => array('name' => 'created_at',
'type' => 'timestamp',
'format' => 'Y-m-d H:i:s',
'disabled' => false,
'options' => array()),
'updated' => array('name' => 'updated_at',
'type' => 'timestamp',
'format' => 'Y-m-d H:i:s',
'disabled' => false,
'options' => array()));
protected $_options = array('created' => array('name' => 'created_at',
'type' => 'timestamp',
'format' => 'Y-m-d H:i:s',
'disabled' => false,
'expression' => false,
'options' => array()),
'updated' => array('name' => 'updated_at',
'type' => 'timestamp',
'format' => 'Y-m-d H:i:s',
'disabled' => false,
'expression' => false,
'options' => array()));
/**
* __construct
*
@ -60,7 +62,7 @@ class Doctrine_Template_Timestampable extends Doctrine_Template
{
$this->_options = Doctrine_Lib::arrayDeepMerge($this->_options, $options);
}
/**
* setTableDefinition
*