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

Merge branch 'master' of dev.sourcefabric.org:airtime

This commit is contained in:
denise 2013-04-30 15:54:20 -04:00
parent ec2f36efa8 decb12f6b8
commit ff2fde0173
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
airtime_mvc/application/models/StoredFile.php
View File

@ -1017,6 +1017,9 @@ SQL;
Logging::info("Successfully written identification file for Logging::info("Successfully written identification file for
uploaded '$audio_stor'"); uploaded '$audio_stor'");
} }
//if the uploaded file is not UTF-8 encoded, let's encode it. Assuming source
//encoding is ISO-8859-1
$audio_stor = mb_detect_encoding($audio_stor, "UTF-8") == "UTF-8" ? $audio_stor : utf8_encode($audio_stor);
Logging::info("copyFileToStor: moving file $audio_file to $audio_stor"); Logging::info("copyFileToStor: moving file $audio_file to $audio_stor");
// Martin K.: changed to rename: Much less load + quicker since this is // Martin K.: changed to rename: Much less load + quicker since this is
// an atomic operation // an atomic operation