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

Merge branch '1.9.1' into devel

Browse source 
Conflicts:
	airtime_mvc/application/controllers/ScheduleController.php
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/models/StoredFile.php
This commit is contained in:
Martin Konecny 2011-10-14 01:38:52 +02:00
commit 5a83c5b81e
7 changed files with 46 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/application/models/Schedule.php
View file

@ -489,7 +489,7 @@ class Application_Model_Schedule {
foreach ($items as $item)
{
$storedFile = Application_Model_StoredFile::Recall($item["file_id"]);
$uri = $storedFile->getFileUrl();
$uri = $storedFile->getFileUrlUsingConfigAddress();
$starts = Application_Model_Schedule::AirtimeTimeToPypoTime($item["starts"]);
$medias[$starts] = array(