From 16b232c857994506d775066753b2cba4ee035774 Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Tue, 13 Mar 2012 04:48:18 +0000
Subject: [PATCH] user needs perm /and/ the image needs to be unlocked

---
 ext/tag_edit/main.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ext/tag_edit/main.php b/ext/tag_edit/main.php
index 8e485f19..9907d5e1 100644
--- a/ext/tag_edit/main.php
+++ b/ext/tag_edit/main.php
@@ -108,21 +108,21 @@ class TagEdit extends Extension {
 
 	public function onOwnerSet(OwnerSetEvent $event) {
 		global $user;
-		if($user->can("edit_image_owner") || !$event->image->is_locked()) {
+		if($user->can("edit_image_owner") && (!$event->image->is_locked() || $user->can("lock_image"))) {
 			$event->image->set_owner($event->owner);
 		}
 	}
 
 	public function onTagSet(TagSetEvent $event) {
 		global $user;
-		if($user->can("edit_image_tag") || !$event->image->is_locked()) {
+		if($user->can("edit_image_tag") && (!$event->image->is_locked() || $user->can("lock_image"))) {
 			$event->image->set_tags($event->tags);
 		}
 	}
 
 	public function onSourceSet(SourceSetEvent $event) {
 		global $user;
-		if($user->can("edit_image_source") || !$event->image->is_locked()) {
+		if($user->can("edit_image_source") && (!$event->image->is_locked() || $user->can("lock_image"))) {
 			$event->image->set_source($event->source);
 		}
 	}