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

Merge branch '2.1.x' into devel

Browse source 
Conflicts:
	airtime_mvc/application/controllers/ApiController.php
This commit is contained in:
denise 2012-07-03 10:42:29 -04:00
commit 3e75b28c9d
6 changed files with 27 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

7
airtime_mvc/application/controllers/ApiController.php
View file

@ -136,9 +136,10 @@ class ApiController extends Zend_Controller_Action
*/
if (!$file_base_name) {
$file_base_name = $full_path;
}
$file_base_name = substr($file_base_name, 1);
} else {
$file_base_name = substr($file_base_name, 1);
}
// possibly use fileinfo module here in the future.
// http://www.php.net/manual/en/book.fileinfo.php
$ext = pathinfo($fileID, PATHINFO_EXTENSION);