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

airtime_mvc/application/models/Preference.php

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

airtime_mvc/application/services/ShowService.php

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