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

Merge branch '2.5.x' into saas

Browse source
This commit is contained in:
Duncan Sommerville 2015-01-26 17:44:41 -05:00
commit b569e9a294
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
airtime_mvc/application/forms/LiveStreamingPreferences.php
View file

@ -29,8 +29,8 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm
$transition_fade = new Zend_Form_Element_Text("transition_fade"); $transition_fade = new Zend_Form_Element_Text("transition_fade");
$transition_fade->setLabel(_("Switch Transition Fade (s)")) $transition_fade->setLabel(_("Switch Transition Fade (s)"))
->setFilters(array('StringTrim')) ->setFilters(array('StringTrim'))
->addValidator('regex', false, array('/^[0-9]{1,2}(\.\d{1,3})?$/', ->addValidator('regex', false, array('/^\d+(\.\d+)?$/',
'messages' => _('enter a time in seconds 0{.000}'))) 'messages' => _('Please enter a time in seconds (eg. 0.5)')))
->setValue($defaultFade) ->setValue($defaultFade)
->setDecorators(array('ViewHelper')); ->setDecorators(array('ViewHelper'));
$this->addElement($transition_fade); $this->addElement($transition_fade);