From 6b2c47a98e54a3c8f91302af82c4b85b3dbe1bd5 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Mon, 15 Dec 2014 08:26:24 +0000 Subject: [PATCH] remove checks for not longer used PEAR Mail_Mime and Mail_mimeDecode classes --- mail/inc/class.mail_activesync.inc.php | 7 +------ mail/setup/setup.inc.php | 7 ------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/mail/inc/class.mail_activesync.inc.php b/mail/inc/class.mail_activesync.inc.php index 941b65048b..3defbf7e25 100644 --- a/mail/inc/class.mail_activesync.inc.php +++ b/mail/inc/class.mail_activesync.inc.php @@ -429,12 +429,7 @@ class mail_activesync implements activesync_plugin_write, activesync_plugin_send debugLog("IMAP-SendMail: " . (isset($rfc822) ? $rfc822 : ""). "task: ".(isset($smartdata['task']) ? $smartdata['task'] : "")." itemid: ".(isset($smartdata['itemid']) ? $smartdata['itemid'] : "")." folder: ".(isset($smartdata['folderid']) ? $smartdata['folderid'] : "")); if ($this->debugLevel>0) debugLog("IMAP-Sendmail: Smartdata = ".array2string($smartdata)); //error_log("IMAP-Sendmail: Smartdata = ".array2string($smartdata)); - // if we cannot decode the mail in question, fail - if (class_exists('Mail_mimeDecode',false)==false && (@include_once 'Mail/mimeDecode.php') === false) - { - debugLog("IMAP-SendMail: Could not find Mail_mimeDecode."); - return false; - } + // initialize our mail_bo if (!isset($this->mail)) $this->mail = mail_bo::getInstance(false,self::$profileID,true,false,true); $activeMailProfiles = $this->mail->getAccountIdentities(self::$profileID); diff --git a/mail/setup/setup.inc.php b/mail/setup/setup.inc.php index 17ce6cccfb..ac84e5401a 100644 --- a/mail/setup/setup.inc.php +++ b/mail/setup/setup.inc.php @@ -61,13 +61,6 @@ $setup_info['mail']['check_install'] = array( 'func' => 'pear_check', 'version' => '1.6.0', // otherwise install of Mail_Mime fails! ), - 'Mail_Mime' => array( - 'func' => 'pear_check', - 'version' => '1.4.1', - ), - 'Mail_mimeDecode' => array( - 'func' => 'pear_check', - ), 'magic_quotes_gpc' => array( 'func' => 'php_ini_check', 'value' => 0,