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

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

@ -131,7 +131,7 @@ class Application_Model_Preference
if ($isUserValue && is_null($userId)) {
throw new Exception("User id can't be null for a user preference.");
}
$res = $cache->fetch($key, $isUserValue, $userId);
if ($res !== false) {
//Logging::info("returning {$key} {$userId} from cache. = {$res}");
@ -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;
}