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

Merge pull request #543 from sanmadjack/develop

Browse Source 
Fixes for bulk add results
This commit is contained in:
Shish 2016-04-01 10:47:13 +01:00
commit dc8efcb680
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ext/bulk_add/main.php
View File

@ -32,7 +32,11 @@ class BulkAdd extends Extension {
set_time_limit(0); set_time_limit(0);
$bae = new BulkAddEvent($_POST['dir']); $bae = new BulkAddEvent($_POST['dir']);
send_event($bae); send_event($bae);
if(strlen($bae->results) > 0) { if(is_array($bae->results)) {
foreach($bae->results as $result) {
$this->theme->add_status("Adding files", $result);
}
} else if(strlen($bae->results) > 0) {
$this->theme->add_status("Adding files", $bae->results); $this->theme->add_status("Adding files", $bae->results);
} }
$this->theme->display_upload_results($page); $this->theme->display_upload_results($page);

4
ext/bulk_add/theme.php
View File

@ -12,9 +12,9 @@ class BulkAddTheme extends Themelet {
$page->add_block(new NavBlock()); $page->add_block(new NavBlock());
$html = ""; $html = "";
foreach($this->messages as $block) { foreach($this->messages as $block) {
$html .= "<br/>" . html_escape($html); $html .= "<br/>" . $block->body;
} }
$page->add_block(new Block("Results", $block)); $page->add_block(new Block("Results", $html));
} }
/* /*