Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cc-5709-airtime-analyzer-refactor' into saas-media-refactor

This commit is contained in:
Albert Santoni 2015-02-20 17:36:15 -05:00
parent 903de66349 909cbae5f4
commit 0c537194ec
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
airtime_mvc/application/models/airtime/CcFiles.php
View File

@ -119,9 +119,8 @@ class CcFiles extends BaseCcFiles {
* @param bool $copyFile True if you want to just copy the false, false if you want to move it (default false) * @param bool $copyFile True if you want to just copy the false, false if you want to move it (default false)
* @throws Exception * @throws Exception
*/ */
public static function createFromLocalFile($filePath, $copyFile=false) public static function createFromLocalFile($fileArray, $filePath, $copyFile=false)
{ {
$fileArray = array();
$info = pathinfo($filePath); $info = pathinfo($filePath);
$fileName = basename($filePath).'.'.$info['extension']; $fileName = basename($filePath).'.'.$info['extension'];
self::createAndImport($fileArray, $filePath, $fileName, $copyFile); self::createAndImport($fileArray, $filePath, $fileName, $copyFile);
@ -281,7 +280,6 @@ class CcFiles extends BaseCcFiles {
if ($storedFile->existsOnDisk()) { if ($storedFile->existsOnDisk()) {
$storedFile->delete(); //TODO: This checks your session permissions... Make it work without a session? $storedFile->delete(); //TODO: This checks your session permissions... Make it work without a session?
} }
$file->delete();
} else { } else {
throw new FileNotFoundException(); throw new FileNotFoundException();
} }