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

Removed user id from cc_pref keystr value

This commit is contained in:
denise 2013-01-10 12:04:27 -05:00
parent 0aeea61006
commit 690a6d2654
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -452,12 +452,12 @@ class Application_Model_Preference
if (is_null($timezone)) { if (is_null($timezone)) {
$timezone = self::GetDefaultTimezone(); $timezone = self::GetDefaultTimezone();
} }
self::setValue("user_".$userId."_timezone", $timezone, true, $userId); self::setValue("user_timezone", $timezone, true, $userId);
} }
public static function GetUserTimezone($id) public static function GetUserTimezone($id)
{ {
return self::getValue("user_".$id."_timezone", true); return self::getValue("user_timezone", true);
} }
public static function GetTimezone() public static function GetTimezone()
@ -484,7 +484,7 @@ class Application_Model_Preference
public static function GetUserLocale($id) public static function GetUserLocale($id)
{ {
return self::getValue("user_".$id."_locale", true); return self::getValue("user_locale", true);
} }
public static function SetUserLocale($userId, $locale = null) public static function SetUserLocale($userId, $locale = null)
@ -494,7 +494,7 @@ class Application_Model_Preference
if (is_null($locale)) { if (is_null($locale)) {
$locale = self::GetDefaultLocale(); $locale = self::GetDefaultLocale();
} }
self::setValue("user_".$userId."_locale", $locale, true, $userId); self::setValue("user_locale", $locale, true, $userId);
} }
public static function GetLocale() public static function GetLocale()

2
airtime_mvc/build/sql/defaultdata.sql
View File

@ -322,7 +322,7 @@ INSERT INTO cc_stream_setting (keyname, value, type) VALUES ('s3_channels', 'ste
-- added in 2.3 -- added in 2.3
INSERT INTO cc_pref("keystr", "valstr") VALUES('locale', 'en_CA'); INSERT INTO cc_pref("keystr", "valstr") VALUES('locale', 'en_CA');
INSERT INTO cc_pref("subjid", "keystr", "valstr") VALUES(1, 'user_1_locale', 'en_CA'); INSERT INTO cc_pref("subjid", "keystr", "valstr") VALUES(1, 'user_locale', 'en_CA');
INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('zh_CN', 'Chinese'); INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('zh_CN', 'Chinese');
INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('en_CA', 'English'); INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('en_CA', 'English');

2
install_minimal/include/AirtimeInstall.php
View File

@ -340,7 +340,7 @@ class AirtimeInstall
if ($result < 1) { if ($result < 1) {
return false; return false;
} }
$sql = "INSERT INTO cc_pref (subjid, keystr, valstr) VALUES (1, 'user_1_timezone', '$defaultTimezone')"; $sql = "INSERT INTO cc_pref (subjid, keystr, valstr) VALUES (1, 'user_timezone', '$defaultTimezone')";
$result = $con->exec($sql); $result = $con->exec($sql);
if ($result < 1) { if ($result < 1) {
return false; return false;