From 5b8f161d1d7c73e902201ded5ad235d5bf75f679 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hnategh@gmail.com>
Date: Tue, 2 Aug 2016 16:44:14 +0200
Subject: [PATCH] * Mail: Fix set vacation via admin does not work anymore

---
 mail/inc/class.mail_hooks.inc.php | 2 +-
 mail/inc/class.mail_sieve.inc.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mail/inc/class.mail_hooks.inc.php b/mail/inc/class.mail_hooks.inc.php
index a71f350938..c5737092d0 100644
--- a/mail/inc/class.mail_hooks.inc.php
+++ b/mail/inc/class.mail_hooks.inc.php
@@ -594,7 +594,7 @@ class mail_hooks
 	public static function access($feature)
 	{
 		static $config=null;
-		if ($GLOBALS['egw_info']['user']['apps']['admin'] || $GLOBALS['egw_info']['user']['apps']['emailadmin'])
+		if ($GLOBALS['egw_info']['user']['apps']['admin'])
 		{
 			return true;	// allways give admins or emailadmins all rights, even if they are in a denied group
 		}
diff --git a/mail/inc/class.mail_sieve.inc.php b/mail/inc/class.mail_sieve.inc.php
index d6d20af1f6..b6aae58e5d 100644
--- a/mail/inc/class.mail_sieve.inc.php
+++ b/mail/inc/class.mail_sieve.inc.php
@@ -67,7 +67,7 @@ class mail_sieve
 	function __construct()
 	{
 		$this->displayCharset = Api\Translation::charset();
-		$this->mail_admin = isset($GLOBALS['egw_info']['user']['apps']['emailadmin']);
+		$this->mail_admin = isset($GLOBALS['egw_info']['user']['apps']['admin']);
 		$this->mailConfig = Api\Config::read('mail');
 
 		$acc_id = isset($_GET['acc_id']) ? (int)$_GET['acc_id'] : Api\Cache::getSession(__CLASS__, 'acc_id');