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

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

Browse source 
Conflicts:
	airtime_mvc/public/js/airtime/library/podcast.js
This commit is contained in:
Albert Santoni 2015-09-22 18:37:41 -04:00
commit 3790b0fa81
5 changed files with 291 additions and 174 deletions
Download patch file Download diff file Expand all files Collapse all files

1
airtime_mvc/application/controllers/LibraryController.php
View file

@ -378,7 +378,6 @@ class LibraryController extends Zend_Controller_Action
$this->view->form = $form;
$this->view->id = $file_id;
$this->view->title = $file->getPropelOrm()->getDbTrackTitle();
$this->view->type = "md";
$this->view->html = $this->view->render('library/edit-file-md.phtml');
}