Merge branch 'cc-5709-airtime-analyzer-refactor' into saas-media-refactor

Conflicts:
	airtime_mvc/application/controllers/plugins/Acl_plugin.php
This commit is contained in:
Albert Santoni 2015-02-24 11:18:49 -05:00
commit c0db309e32
5 changed files with 35 additions and 11 deletions

View file

@ -19,9 +19,9 @@ class FileDataHelper {
}
if (array_key_exists("bpm", $data)) {
//Some BPM tags are silly and include the word "BPM". Let's strip that...
$data["year"] = str_ireplace("BPM", "", $data["year"]);
$data["bpm"] = str_ireplace("BPM", "", $data["bpm"]);
// This will convert floats to ints too.
$data["year"] = intval($data["year"]);
$data["bpm"] = intval($data["bpm"]);
}
}