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

Merge branch '2.5.x' into cc-5594-date_default

Browse source
This commit is contained in:
Naomi 2013-12-06 18:18:17 -05:00
commit 0f28e0f1aa
2 changed files with 3 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
airtime_mvc/application/models/Preference.php
View file

@ -146,8 +146,7 @@ class Application_Model_Preference
$paramMap[':key'] = $key; $paramMap[':key'] = $key;
//For user specific preference, check if id matches as well //For user specific preference, check if id matches as well
if (isset($userId)) { if ($isUserValue) {
$sql .= " AND subjid = :id"; $sql .= " AND subjid = :id";
$paramMap[':id'] = $userId; $paramMap[':id'] = $userId;
} }
@ -166,7 +165,7 @@ class Application_Model_Preference
$paramMap[':key'] = $key; $paramMap[':key'] = $key;
//For user specific preference, check if id matches as well //For user specific preference, check if id matches as well
if (isset($userId)) { if ($isUserValue) {
$sql .= " AND subjid = :id"; $sql .= " AND subjid = :id";
$paramMap[':id'] = $userId; $paramMap[':id'] = $userId;
} }

6
airtime_mvc/application/services/ShowService.php
View file

@ -778,12 +778,6 @@ SQL;
->save(); ->save();
} }
} }
//remove the old repeating deleted instances.
/*CcShowInstancesQuery::create()
->filterByDbShowId($showId)
->filterByDbModifiedInstance(true)
->delete();*/
} }
return false; return false;