Merge branch 'devel' into cc-1960-internationalize-airtime

Conflicts:
	airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js
This commit is contained in:
denise 2012-11-21 11:44:40 -05:00
commit 10b6dd202e
24 changed files with 370 additions and 393 deletions

View file

@ -450,8 +450,12 @@ SQL;
public function unhideFiles()
{
$files = $this->_dir->getCcFiless();
$hid = 0;
foreach ($files as $file) {
$hid++;
$file->setDbHidden(false);
$file->save();
}
Logging::info("unhide '$hid' files");
}
}