CC-3756: Cannot download/preview tracks in Media Library
-Fixed
This commit is contained in:
parent
96d2f657f7
commit
65e771d189
|
@ -46,7 +46,7 @@ class Application_Model_StoredFile {
|
||||||
"md5" => "DbMd5",
|
"md5" => "DbMd5",
|
||||||
"ftype" => "DbFtype",
|
"ftype" => "DbFtype",
|
||||||
"language" => "DbLanguage",
|
"language" => "DbLanguage",
|
||||||
"filepath" => "DbFilepath",
|
//"filepath" => "DbFilepath",
|
||||||
"directory" => "DbDirectory"
|
"directory" => "DbDirectory"
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@ -221,10 +221,20 @@ class Application_Model_StoredFile {
|
||||||
{
|
{
|
||||||
$c = get_defined_constants(true);
|
$c = get_defined_constants(true);
|
||||||
$md = array();
|
$md = array();
|
||||||
|
|
||||||
|
/* Create a copy of dbMD here and create a "filepath" key inside of
|
||||||
|
* it. The reason we do this here, instead of creating this key inside
|
||||||
|
* dbMD is because "filepath" isn't really metadata, and we don't want
|
||||||
|
* filepath updated everytime the metadata changes. Also it needs extra
|
||||||
|
* processing before we can write it to the database (needs to be split
|
||||||
|
* into base and relative path)
|
||||||
|
* */
|
||||||
|
$dbmd_copy = $this->_dbMD;
|
||||||
|
$dbmd_copy["filepath"] = "DbFilepath";
|
||||||
|
|
||||||
foreach ($c['user'] as $constant => $value) {
|
foreach ($c['user'] as $constant => $value) {
|
||||||
if (preg_match('/^MDATA_KEY/', $constant)) {
|
if (preg_match('/^MDATA_KEY/', $constant)) {
|
||||||
if (isset($this->_dbMD[$value])) {
|
if (isset($dbmd_copy[$value])) {
|
||||||
$md[$constant] = $this->getDbColMetadataValue($value);
|
$md[$constant] = $this->getDbColMetadataValue($value);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -450,7 +460,7 @@ Logging::log("getting media! - 2");
|
||||||
|
|
||||||
if(isset($md)) {
|
if(isset($md)) {
|
||||||
$storedFile->setMetadata($md);
|
$storedFile->setMetadata($md);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $storedFile;
|
return $storedFile;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue