Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

This commit is contained in:
denise 2013-01-08 15:09:55 -05:00
commit a7992c291e
6 changed files with 2666 additions and 2460 deletions

View file

@ -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;
}

File diff suppressed because it is too large Load diff

File diff suppressed because one or more lines are too long