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

Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x

This commit is contained in:
Naomi 2013-12-11 17:35:47 -05:00
parent e6d28b250e 3a50f7a6dc
commit e6c971387b
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
airtime_mvc/application/forms/AddShowRepeats.php
View File

@ -95,15 +95,18 @@ class Application_Form_AddShowRepeats extends Zend_Form_SubForm
if (!$formData['add_show_no_end']) {
$start_timestamp = $formData['add_show_start_date'];
$end_timestamp = $formData['add_show_end_date'];
$showTimeZone = new DateTimeZone($formData['add_show_timezone']);
$start_epoch = strtotime($start_timestamp);
$end_epoch = strtotime($end_timestamp);
//We're assuming all data is valid at this point (timezone, etc.).
if ($end_epoch < $start_epoch) {
$startDate = new DateTime($start_timestamp, $showTimeZone);
$endDate = new DateTime($end_timestamp, $showTimeZone);
if ($endDate < $startDate) {
$this->getElement('add_show_end_date')->setErrors(array(_('End date must be after start date')));
return false;
}
return true;
}
if (!isset($formData['add_show_day_check'])) {

4
airtime_mvc/application/models/Preference.php
View File

@ -67,7 +67,7 @@ class Application_Model_Preference
elseif ($result == 1) {
// result found
if (is_null($userId)) {
if (!$isUserValue) {
// system pref
$sql = "UPDATE cc_pref"
." SET subjid = NULL, valstr = :value"
@ -85,7 +85,7 @@ class Application_Model_Preference
else {
// result not found
if (is_null($userId)) {
if (!$isUserValue) {
// system pref
$sql = "INSERT INTO cc_pref (keystr, valstr)"
." VALUES (:key, :value)";