From 500545ecfe71cb20a0afec0bf37e3f30339c8513 Mon Sep 17 00:00:00 2001 From: brettp Date: Sun, 20 Feb 2011 19:30:08 +0000 Subject: Refs #2787, #2956: Merged fix for deleting group icon files on group delete to trunk. git-svn-id: http://code.elgg.org/elgg/trunk@8368 36083f99-b078-4883-b0ff-0f9b5a30f544 --- mod/groups/actions/delete.php | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) (limited to 'mod/groups') diff --git a/mod/groups/actions/delete.php b/mod/groups/actions/delete.php index a99b3a2c6..6eed12a9c 100644 --- a/mod/groups/actions/delete.php +++ b/mod/groups/actions/delete.php @@ -3,18 +3,30 @@ * Delete a group */ -$guid = (int)get_input('group_guid'); +$guid = (int) get_input('group_guid'); $entity = get_entity($guid); -if (($entity) && ($entity instanceof ElggGroup)) -{ - if ($entity->delete()) +if (($entity) && ($entity instanceof ElggGroup)) { + // delete group icons + $owner_guid = $entity->owner_guid; + $prefix = "groups/" . $entity->guid; + $imagenames = array('.jpg', 'tiny.jpg', 'small.jpg', 'medium.jpg', 'large.jpg'); + $img = new ElggFile(); + $img->owner_guid = $owner_guid; + foreach ($imagenames as $name) { + $img->setFilename($prefix . $name); + $img->delete(); + } + + // delete group + if ($entity->delete()) { system_message(elgg_echo('group:deleted')); - else + } else { register_error(elgg_echo('group:notdeleted')); -} -else + } +} else { register_error(elgg_echo('group:notdeleted')); +} $url_name = elgg_get_logged_in_user_entity()->username; forward(elgg_get_site_url() . "pg/groups/member/{$url_name}"); -- cgit v1.2.3