Merge branch 'CC-3963' into 2.1.x
Conflicts: airtime_mvc/public/js/airtime/preferences/streamsetting.js
This commit is contained in:
commit
73a7a76078
7 changed files with 149 additions and 71 deletions
|
@ -877,6 +877,14 @@ class Application_Model_Preference
|
|||
return self::GetValue("auto_transition");
|
||||
}
|
||||
|
||||
public static function SetAutoSwitch($value){
|
||||
self::SetValue("auto_switch", $value, false);
|
||||
}
|
||||
|
||||
public static function GetAutoSwitch(){
|
||||
return self::GetValue("auto_switch");
|
||||
}
|
||||
|
||||
public static function SetEnableSystemEmail($upload) {
|
||||
self::SetValue("enable_system_email", $upload);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue