Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

CC-3639: Preferences-> Fade In is interpreted improperly (it is insanely high)

Browse source 
- the regular exp check in model class was wrong
This commit is contained in:
James 2012-04-13 12:05:59 -04:00
parent ef908ee894
commit 1bb04296a9
4 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
airtime_mvc/application/models/airtime/CcSchedule.php
View file

@ -110,7 +110,7 @@ class CcSchedule extends BaseCcSchedule {
if ($v instanceof DateTime) {
$dt = $v;
}
else if (preg_match('/^[0-5][0-9](\.\d{1,6})?$/', $v)) {
else if (preg_match('/^[0-9]{1,2}(\.\d{1,6})?$/', $v)) {
$dt = DateTime::createFromFormat("s.u", $v);
}
else {
@ -120,7 +120,6 @@ class CcSchedule extends BaseCcSchedule {
throw new PropelException('Error parsing date/time value: ' . var_export($v, true), $x);
}
}
$this->fade_in = $dt->format('H:i:s.u');
$this->modifiedColumns[] = CcSchedulePeer::FADE_IN;
@ -138,7 +137,7 @@ class CcSchedule extends BaseCcSchedule {
if ($v instanceof DateTime) {
$dt = $v;
}
else if (preg_match('/^[0-5][0-9](\.\d{1,6})?$/', $v)) {
else if (preg_match('/^[0-9]{1,2}(\.\d{1,6})?$/', $v)) {
$dt = DateTime::createFromFormat("s.u", $v);
}
else {