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

Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage

Browse source 
Conflicts:
	airtime_mvc/build/sql/schema.sql
This commit is contained in:
drigato 2015-01-22 15:48:34 -05:00
commit 134ade877c
49 changed files with 739 additions and 548 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/application/modules/rest/controllers/MediaController.php
View file

@ -372,7 +372,7 @@ class Rest_MediaController extends Zend_Rest_Controller
private function getOwnerId()
{
try {
if ($this->verifySession()) {
if (Zend_Auth::getInstance()->hasIdentity()) {
$service_user = new Application_Service_UserService();
return $service_user->getCurrentUser()->getDbId();
} else {