From 7fe3811c65a7c63154f03610e289a6d196f3ae2e Mon Sep 17 00:00:00 2001 From: thomascube <thomas@roundcube.net> Date: Wed, 18 Jan 2012 06:10:46 -0500 Subject: [PATCH] Changed license to GNU GPLv3+ with exceptions for skins and plugins --- program/steps/settings/delete_identity.inc | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/program/steps/settings/delete_identity.inc b/program/steps/settings/delete_identity.inc index 275bcb6..b482c33 100644 --- a/program/steps/settings/delete_identity.inc +++ b/program/steps/settings/delete_identity.inc @@ -6,7 +6,10 @@ | | | This file is part of the Roundcube Webmail client | | Copyright (C) 2005-2009, The Roundcube Dev Team | - | Licensed under the GNU GPL | + | | + | Licensed under the GNU General Public License version 3 or | + | any later version with exceptions for skins & plugins. | + | See the README file for a full license statement. | | | | PURPOSE: | | Delete the submitted identities (IIDs) from the database | @@ -32,7 +35,7 @@ { $plugin = $RCMAIL->plugins->exec_hook('identity_delete', array('id' => $iid)); - $deleted = !$plugin['abort'] ? $USER->delete_identity($iid) : $plugin['result']; + $deleted = !$plugin['abort'] ? $RCMAIL->user->delete_identity($iid) : $plugin['result']; if ($deleted > 0 && $deleted !== false) $OUTPUT->show_message('deletedsuccessfully', 'confirmation', null, false); -- Gitblit v1.9.1