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

Merge commit '08864f79347e912e990f5ce0e86e5a8e739dc29d'

Browse source 
Conflicts:
	VERSION
	airtime_mvc/application/configs/conf.php
	airtime_mvc/application/models/Shows.php
This commit is contained in:
Paul Baranowski 2011-04-25 18:49:51 -04:00
commit d14dc6cbe3
2 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
airtime_mvc/application/models/StoredFile.php
View file

@ -1170,10 +1170,7 @@ class StoredFile {
return TRUE;
}
else {
return PEAR::raiseError(
"StoredFile::deleteFile: unlink failed ({$this->filepath})",
GBERR_FILEIO
);
return PEAR::raiseError("StoredFile::deleteFile: unlink failed ({$this->filepath})");
}
}
else {
@ -1233,7 +1230,10 @@ class StoredFile {
$files = StoredFile::getAll();
foreach ($files as $file) {
$media = StoredFile::Recall($file["id"]);
$media->delete();
$result = $media->delete();
if (PEAR::isError($result)) {
return $result;
}
}
}