From 470222a386fe5cb3c2f0f1a91efce6490a9dc6f5 Mon Sep 17 00:00:00 2001 From: Megan Watson Date: Wed, 28 May 2008 15:00:12 +0000 Subject: [PATCH] KTS-3395 "CLONE -Unable to remove sub-group (SUP-691)" Fixed. On removeMemberGroup(), changed the check to check member groups instead of member users. --- lib/groups/Group.inc | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/groups/Group.inc b/lib/groups/Group.inc index f065e8a..b3dda7e 100644 --- a/lib/groups/Group.inc +++ b/lib/groups/Group.inc @@ -8,31 +8,31 @@ * Document Management Made Simple * Copyright (C) 2008 KnowledgeTree Inc. * Portions copyright The Jam Warehouse Software (Pty) Limited - * + * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the * Free Software Foundation. - * + * * This program is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * - * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco, + * + * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco, * California 94120-7775, or email info@knowledgetree.com. - * + * * The interactive user interfaces in modified source and object code versions * of this program must display Appropriate Legal Notices, as required under * Section 5 of the GNU General Public License version 3. - * + * * In accordance with Section 7(b) of the GNU General Public License version 3, * these Appropriate Legal Notices must retain the display of the "Powered by - * KnowledgeTree" logo and retain the original copyright notice. If the display of the + * KnowledgeTree" logo and retain the original copyright notice. If the display of the * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices - * must display the words "Powered by KnowledgeTree" and retain the original + * must display the words "Powered by KnowledgeTree" and retain the original * copyright notice. * Contributor( s): ______________________________________ */ @@ -323,8 +323,8 @@ class Group extends KTEntity { if (PEAR::isError($res)) { return $res; } - if ($this->hasMember($oGroup)) { - return PEAR::raiseError(_kt("Tried to remove member from database, apparently successfully, but hasMember thinks they're still members?")); + if ($this->hasMemberGroup($oGroup)) { + return PEAR::raiseError(_kt("An error occurred while removing the sub-group.")); } return true; } -- libgit2 0.21.4