Merge branch 'saas-dev-publishing' of github.com:sourcefabric/Airtime into saas-dev-publishing

Conflicts:
	airtime_mvc/application/services/PodcastService.php
This commit is contained in:
Albert Santoni 2015-11-17 19:35:05 -05:00
commit ddb2a225f8
5 changed files with 7 additions and 10 deletions

View file

@ -375,9 +375,9 @@ class Application_Service_PodcastService
$atomLink->addAttribute("rel", "self");
$atomLink->addAttribute("type", "application/rss+xml");
$imageUrl = Application_Common_HTTPHelper::getStationUrl(false)."images/airtime_logo.png";
$imageUrl = Application_Common_HTTPHelper::getStationUrl(false)."api/station-logo";
$image = $channel->addChild("image");
$image->addChild("title", "image title");
$image->addChild("title", $podcast->getDbTitle());
self::addEscapedChild($image, "url", $imageUrl);
self::addEscapedChild($image, "link", Application_Common_HTTPHelper::getStationUrl(false));