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

Fix bad merge

This commit is contained in:
Albert Santoni 2014-11-18 18:17:19 -05:00
parent dd3b54f8ed
commit c829b6bf95
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
airtime_mvc/application/models/StoredFile.php
View File

@ -387,7 +387,6 @@ SQL;
assert($music_dir); assert($music_dir);
$type = $music_dir->getType(); $type = $music_dir->getType();
Logging::info($_SERVER["HTTP_HOST"].": User ".$user->getLogin()." is deleting file: ".$this->_file->getDbTrackTitle()." - file id: ".$this->_file->getDbId()); Logging::info($_SERVER["HTTP_HOST"].": User ".$user->getLogin()." is deleting file: ".$this->_file->getDbTrackTitle()." - file id: ".$this->_file->getDbId());
try { try {
@ -402,17 +401,7 @@ SQL;
//If the file didn't exist on disk, that's fine, we still want to //If the file didn't exist on disk, that's fine, we still want to
//remove it from the database, so we continue here. //remove it from the database, so we continue here.
} }
<<<<<<< Updated upstream
Logging::info("User ".$user->getLogin()." is deleting file: ".$this->_file->getDbTrackTitle()." - file id: ".$this->_file->getDbId());
// set hidden flag to true
//$this->_file->setDbHidden(true);
$this->_file->setDbFileExists(false);
$this->_file->save();
=======
>>>>>>> Stashed changes
// need to explicitly update any playlist's and block's length // need to explicitly update any playlist's and block's length
// that contains the file getting deleted // that contains the file getting deleted
$fileId = $this->_file->getDbId(); $fileId = $this->_file->getDbId();