Merge branch 'saas-dev' into soundcloud

This commit is contained in:
Duncan Sommerville 2015-06-18 13:29:59 -04:00
commit 02e0537be9
13 changed files with 54 additions and 54 deletions

View file

@ -407,7 +407,7 @@ class LibraryController extends Zend_Controller_Action
$this->view->sEcho = $r["sEcho"];
$this->view->iTotalDisplayRecords = $r["iTotalDisplayRecords"];
$this->view->iTotalRecords = $r["iTotalRecords"];
$this->view->files = $r["aaData"];
$this->view->files = SecurityHelper::htmlescape_recursive($r["aaData"]);
}
public function editFileMdAction()