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

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

Browse source
This commit is contained in:
Naomi 2013-12-11 17:35:47 -05:00
commit e6c971387b
2 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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)";