Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
This commit is contained in:
commit
a7992c291e
6 changed files with 2666 additions and 2460 deletions
|
@ -201,6 +201,13 @@ class Application_Model_StreamSetting
|
|||
"value"=>self::getDjLiveStreamMountPoint(),
|
||||
"type"=>"string");
|
||||
}
|
||||
|
||||
$sql = "SELECT *"
|
||||
." FROM cc_pref"
|
||||
." WHERE keystr = 'off_air_meta'";
|
||||
|
||||
$out = $con->query($sql)->fetchAll();
|
||||
$rows[] = array("keyname" => $out[0]["keystr"], "value"=>$out[0]["valstr"], "type"=>"string");
|
||||
|
||||
return $rows;
|
||||
}
|
||||
|
|
Binary file not shown.
File diff suppressed because it is too large
Load diff
File diff suppressed because one or more lines are too long
Loading…
Add table
Add a link
Reference in a new issue