delete cached thumb blocks after replacing images

This commit is contained in:
Shish 2018-06-20 03:08:40 +01:00
parent 60c16a9139
commit c9d7bd1ae3
2 changed files with 5 additions and 1 deletions

View File

@ -20,6 +20,7 @@ class RegenThumb extends Extension {
if($event->page_matches("regen_thumb/one") && $user->can("delete_image") && isset($_POST['image_id'])) { if($event->page_matches("regen_thumb/one") && $user->can("delete_image") && isset($_POST['image_id'])) {
$image = Image::by_id(int_escape($_POST['image_id'])); $image = Image::by_id(int_escape($_POST['image_id']));
send_event(new ThumbnailGenerationEvent($image->hash, $image->ext, true)); send_event(new ThumbnailGenerationEvent($image->hash, $image->ext, true));
$database->cache->delete("thumb-block:{$image->id}");
$this->theme->display_results($page, $image); $this->theme->display_results($page, $image);
} }
if($event->page_matches("regen_thumb/mass") && $user->can("delete_image") && isset($_POST['tags'])) { if($event->page_matches("regen_thumb/mass") && $user->can("delete_image") && isset($_POST['tags'])) {
@ -28,6 +29,7 @@ class RegenThumb extends Extension {
foreach($images as $image) { foreach($images as $image) {
send_event(new ThumbnailGenerationEvent($image->hash, $image->ext, true)); send_event(new ThumbnailGenerationEvent($image->hash, $image->ext, true));
$database->cache->delete("thumb-block:{$image->id}");
} }
$page->set_mode("redirect"); $page->set_mode("redirect");

View File

@ -129,7 +129,7 @@ class Upload extends Extension {
} }
public function onPageRequest(PageRequestEvent $event) { public function onPageRequest(PageRequestEvent $event) {
global $page, $user; global $database, $page, $user;
if($event->page_matches("upload/replace")) { if($event->page_matches("upload/replace")) {
// check if the user is an administrator and can upload files. // check if the user is an administrator and can upload files.
@ -177,6 +177,7 @@ class Upload extends Extension {
} }
} }
} }
$database->cache->delete("thumb-block:{$image_id}");
$this->theme->display_upload_status($page, $ok); $this->theme->display_upload_status($page, $ok);
} }
else if(!empty($_GET['url'])) { else if(!empty($_GET['url'])) {
@ -184,6 +185,7 @@ class Upload extends Extension {
$tags = isset($_GET['tags']) ? Tag::explode($_GET['tags']) : 'tagme'; $tags = isset($_GET['tags']) ? Tag::explode($_GET['tags']) : 'tagme';
$source = isset($_GET['source']) ? $_GET['source'] : $url; $source = isset($_GET['source']) ? $_GET['source'] : $url;
$ok = $this->try_transload($url, $tags, $source, $image_id); $ok = $this->try_transload($url, $tags, $source, $image_id);
$database->cache->delete("thumb-block:{$image_id}");
$this->theme->display_upload_status($page, $ok); $this->theme->display_upload_status($page, $ok);
} }
else { else {