From f686264ad6d82cfaf4e401da2e259880f57bfade Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sat, 30 Jan 2016 07:44:29 -0500
Subject: [PATCH] Merge branch 'master' into 'stable-3.1'
---
interface/web/mail/xmpp_user_del.php | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/interface/web/mail/xmpp_user_del.php b/interface/web/mail/xmpp_user_del.php
index 3d32f7f..cf0cc62 100644
--- a/interface/web/mail/xmpp_user_del.php
+++ b/interface/web/mail/xmpp_user_del.php
@@ -58,7 +58,8 @@
$domain = $jid_parts[1];
// check if domain is managed through mail domain
- $app->error('blubb');
+ // if yes, manual deletion is not allowed
+ //$app->error('blubb');
}
--
Gitblit v1.9.1