Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

2012-04-25 15:22:51 +02:00 · 2012-04-25 15:22:51 +02:00 · 9b4c3efe8e
parent b6bed6ce7a eec14f9592
commit 9b4c3efe8e
1 changed files with 2 additions and 2 deletions
--- a/airtime_mvc/application/forms/AddShowWhen.php
+++ b/airtime_mvc/application/forms/AddShowWhen.php
@ -32,8 +32,8 @@ class Application_Form_AddShowWhen extends Zend_Form_SubForm
                    ->setValidators(array(
                        'NotEmpty',
                        array('date', false, array('HH:mm')),
-                        array('regex', false, array('/^[0-9:]+$/', 'messages' => 'Invalid character entered'))))
-                    ->setDecorators(array('ViewHelper'));
+                        array('regex', false, array('/^[0-2][0-3]:[0-5][0-9]$/', 'messages' => 'Time format should be HH:mm'))
+                        ))->setDecorators(array('ViewHelper'));
        $startTime->setAttrib('alt', 'time');
        $this->addElement($startTime);