-undo weird automerge by git.

This commit is contained in:
martin 2011-10-04 14:11:20 -04:00
parent cb3060623c
commit d54066fca8
1 changed files with 0 additions and 21 deletions

View File

@ -598,27 +598,6 @@ class Application_Model_StoredFile {
return $res;
}
public static function RecallByPartialFilepath($partial_path){
$path_info = MusicDir::splitFilePath($partial_path);
if (is_null($path_info)) {
return null;
}
$music_dir = MusicDir::getDirByPath($path_info[0]);
$files = CcFilesQuery::create()
->filterByDbDirectory($music_dir->getId())
->filterByDbFilepath("$path_info[1]%")
->find();
$res = array();
foreach ($files as $file){
$storedFile = new StoredFile();
$storedFile->_file = $file;
$res[] = $storedFile;
}
return $res;
}
public static function searchFilesForPlaylistBuilder($datatables) {
global $CC_CONFIG;