james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #326 from Madoushi90/archive_fixes

Browse Source 
handle_archive extension fixes
This commit is contained in:
Shish 2013-08-22 04:47:08 -07:00
commit 47abed28c3
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ext/handle_archive/main.php
View File

@ -59,7 +59,7 @@ class ArchiveFileHandler extends Extension {
$metadata['extension'] = $pathinfo['extension']; $metadata['extension'] = $pathinfo['extension'];
$metadata['tags'] = $tags; $metadata['tags'] = $tags;
$metadata['source'] = null; $metadata['source'] = null;
$event = new DataUploadEvent($user, $tmpname, $metadata); $event = new DataUploadEvent($tmpname, $metadata);
send_event($event); send_event($event);
} }
catch(UploadException $ex) { catch(UploadException $ex) {
@ -74,7 +74,14 @@ class ArchiveFileHandler extends Extension {
$list = ""; $list = "";
$dir = opendir("$base/$subdir"); $dir = opendir("$base/$subdir");
while($filename = readdir($dir)) {
$files = array();
while($f = readdir($dir)) {
$files[] = $f;
}
sort($files);
foreach($files as $filename) {
$fullpath = "$base/$subdir/$filename"; $fullpath = "$base/$subdir/$filename";
if(is_link($fullpath)) { if(is_link($fullpath)) {