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

merge from devel

Browse source
This commit is contained in:
denise 2012-12-03 11:06:56 -05:00
parent 2f0c6b702a
commit b2699fa914
17 changed files with 143 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

4
airtime_mvc/application/models/Webstream.php
View file

@ -34,7 +34,7 @@ class Application_Model_Webstream implements Application_Model_LibraryEditable
public function getCreatorId()
{
return $this->Webstream->getCcSubjs()->getDbId();
return $this->webstream->getDbCreatorId();
}
public function getLastModified($p_type)
@ -51,7 +51,7 @@ class Application_Model_Webstream implements Application_Model_LibraryEditable
$di = new DateInterval("PT{$hours}H{$min}M{$sec}S");
return $di->format("%Hh %Im");
}
}
return "";
}