git-svn-id: file:///home/shish/svn/shimmie2/trunk@269 7f39781d-f577-437e-ae19-be835c7a54ca
This commit is contained in:
shish 2007-07-12 08:39:13 +00:00
parent b8b968ab56
commit a9908508d0
3 changed files with 6 additions and 4 deletions

View File

@ -41,8 +41,9 @@ class BulkAdd extends Extension {
$image = new Image($tmpname, $filename, $tags); $image = new Image($tmpname, $filename, $tags);
if($image->is_ok()) { if($image->is_ok()) {
send_event(new UploadingImageEvent($image)); $uie = new UploadingImageEvent($image);
$ok = true; send_event($uie);
$ok = $uie->_live;
} }
} }

View File

@ -22,7 +22,8 @@ class ImageIO extends Extension {
} }
if(is_a($event, 'UploadingImageEvent')) { if(is_a($event, 'UploadingImageEvent')) {
$event->ok = $this->add_image($event->image); $ok = $this->add_image($event->image);
if(!$ok) $event->veto();
} }
if(is_a($event, 'ImageDeletionEvent')) { if(is_a($event, 'ImageDeletionEvent')) {

View File

@ -71,7 +71,7 @@ class Upload extends Extension {
if($image->is_ok()) { if($image->is_ok()) {
$event = new UploadingImageEvent($image); $event = new UploadingImageEvent($image);
send_event($event); send_event($event);
$ok = $event->ok; $ok = $event->_live;
} }
else { else {
$this->theme->display_upload_error("Error with ".html_escape($file['name']), $this->theme->display_upload_error("Error with ".html_escape($file['name']),