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

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

Browse source
This commit is contained in:
denise 2012-05-04 15:58:14 -04:00
commit 7c06e27e7f
7 changed files with 35 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -61,7 +61,13 @@ class Application_Model_Preference
." VALUES ($id, '$key', $value)";
}
}
return $con->exec($sql);
try {
$con->exec($sql);
} catch (Exception $e){
Logging::log("Could not connect to database.");
header('HTTP/1.0 503 Service Unavailable');
exit;
}
}
public static function GetValue($key, $isUserValue = false){

4
airtime_mvc/application/models/StoredFile.php
View file

@ -235,7 +235,9 @@ class Application_Model_StoredFile {
foreach ($c['user'] as $constant => $value) {
if (preg_match('/^MDATA_KEY/', $constant)) {
if (isset($dbmd_copy[$value])) {
$md[$constant] = $this->getDbColMetadataValue($value);
$propelColumn = $dbmd_copy[$value];
$method = "get$propelColumn";
$md[$constant] = $this->_file->$method();
}
}
}