cc-3936: added warning for metadata attributes that are not defined in constants.php
This commit is contained in:
parent
c14af747b0
commit
dea764b8fd
|
@ -31,6 +31,7 @@ define('MDATA_KEY_TRACKNUMBER', 'track_number');
|
||||||
define('MDATA_KEY_CONDUCTOR', 'conductor');
|
define('MDATA_KEY_CONDUCTOR', 'conductor');
|
||||||
define('MDATA_KEY_LANGUAGE', 'language');
|
define('MDATA_KEY_LANGUAGE', 'language');
|
||||||
define('MDATA_KEY_REPLAYGAIN', 'replay_gain');
|
define('MDATA_KEY_REPLAYGAIN', 'replay_gain');
|
||||||
|
define('MDATA_KEY_OWNER_ID', 'owner_id');
|
||||||
|
|
||||||
define('UI_MDATA_VALUE_FORMAT_FILE', 'File');
|
define('UI_MDATA_VALUE_FORMAT_FILE', 'File');
|
||||||
define('UI_MDATA_VALUE_FORMAT_STREAM', 'live stream');
|
define('UI_MDATA_VALUE_FORMAT_STREAM', 'live stream');
|
||||||
|
|
|
@ -125,6 +125,9 @@ class Application_Model_StoredFile
|
||||||
foreach ($p_md as $mdConst => $mdValue) {
|
foreach ($p_md as $mdConst => $mdValue) {
|
||||||
if (defined($mdConst)) {
|
if (defined($mdConst)) {
|
||||||
$dbMd[constant($mdConst)] = $mdValue;
|
$dbMd[constant($mdConst)] = $mdValue;
|
||||||
|
} else {
|
||||||
|
Logging::info("Warning: using metadata that is not defined.
|
||||||
|
[$mdConst] => [$mdValue]");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$this->setDbColMetadata($dbMd);
|
$this->setDbColMetadata($dbMd);
|
||||||
|
@ -153,7 +156,6 @@ class Application_Model_StoredFile
|
||||||
if (!array_key_exists('MDATA_KEY_OWNER_ID', $p_md)) {
|
if (!array_key_exists('MDATA_KEY_OWNER_ID', $p_md)) {
|
||||||
//$admins = Application_Model_User::getUsers(array('A'));
|
//$admins = Application_Model_User::getUsers(array('A'));
|
||||||
$admins = Application_Model_User::getUsersOfType('A');
|
$admins = Application_Model_User::getUsersOfType('A');
|
||||||
//$admins = array();
|
|
||||||
if (count($admins) > 0) { // found admin => pick first one
|
if (count($admins) > 0) { // found admin => pick first one
|
||||||
$owner = $admins[0];
|
$owner = $admins[0];
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue