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

Merge branch '1.9.1' into devel

This commit is contained in:
martin 2011-08-19 12:30:14 -04:00
parent e14e4f3713 fa50c93914
commit 75ac719b33
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
airtime_mvc/application/models/Dashboard.php
View File

@ -69,11 +69,15 @@ class Application_Model_Dashboard
} else {
if (count($row) == 0){
//last item is a show instance
if ($showInstance->isRecorded()){
return array("name"=>$showInstance->getName(),
"starts"=>$showInstance->getShowStart(),
"ends"=>$showInstance->getShowEnd(),
"media_item_played"=>false,
"record"=>$showInstance->isRecorded());
"record"=>true);
} else {
return null;
}
} else {
return array("name"=>$row[0]["artist_name"]." - ".$row[0]["track_title"],
"starts"=>$row[0]["starts"],