Cavemanon/cavepaintings
7
Fork 2
Code Issues 3 Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/shish/shimmie2

Browse Source
This commit is contained in:
Zarek Jenkinson
2013-06-13 23:47:47 +12:00
parent ac764d0e9c 2859d58191
commit f2d0bc6cfa
8 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ext/image_hash_ban/main.php
View File

@ -64,18 +64,15 @@ class ImageBan extends Extension {
if($hash) {
send_event(new AddImageHashBanEvent($hash, $reason));
flash_message("Image ban added");
$page->set_mode("redirect");
$page->set_redirect(make_link("image_hash_ban/list/1"));
if($image) {
send_event(new ImageDeletionEvent($image));
flash_message("Image deleted");
$page->set_mode("redirect");
$page->set_redirect(make_link("post/list"));
}
$page->set_mode("redirect");
$page->set_redirect($_SERVER['HTTP_REFERER']);
}
}
else if($event->get_arg(0) == "remove") {
@ -84,7 +81,7 @@ class ImageBan extends Extension {
flash_message("Image ban removed");
$page->set_mode("redirect");
$page->set_redirect(make_link("image_hash_ban/list/1"));
$page->set_redirect($_SERVER['HTTP_REFERER']);
}
}
else if($event->get_arg(0) == "list") {

4
ext/tag_edit/main.php
View File

@ -108,10 +108,10 @@ class TagEdit extends Extension {
$owner = User::by_name($_POST['tag_edit__owner']);
send_event(new OwnerSetEvent($event->image, $owner));
}
if($this->can_tag($event->image)) {
if($this->can_tag($event->image) && isset($_POST['tag_edit__tags'])) {
send_event(new TagSetEvent($event->image, $_POST['tag_edit__tags']));
}
if($this->can_source($event->image)) {
if($this->can_source($event->image) && isset($_POST['tag_edit__source'])) {
send_event(new SourceSetEvent($event->image, $_POST['tag_edit__source']));
}
if($user->can("edit_image_lock")) {