From: Michael M Slusarz <slusarz@curecanti.org>
Date: Sat, 30 Jan 2010 18:02:10 +0000 (-0700)
Subject: Use PEAR to manage minimum package dependencies
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=eb78b692cb14c30842b694bea32e15d309233884;p=horde.git

Use PEAR to manage minimum package dependencies
---

diff --git a/framework/Mime/lib/Horde/Mime/Part.php b/framework/Mime/lib/Horde/Mime/Part.php
index 285e88fc1..46f4d79f6 100644
--- a/framework/Mime/lib/Horde/Mime/Part.php
+++ b/framework/Mime/lib/Horde/Mime/Part.php
@@ -1450,10 +1450,9 @@ class Horde_Mime_Part
          * BINARYMIME (RFC 3030) extensions? Requires PEAR's Mail package
          * version 1.2+ and Net_SMTP version 1.3+. */
         $encode = self::ENCODE_7BIT;
-        if (($driver == 'smtp') && method_exists($mailer, 'getSMTPObject')) {
+        if ($driver == 'smtp') {
             $net_smtp = $mailer->getSMTPObject();
-            if (!($net_smtp instanceof PEAR_Error) &&
-                method_exists($net_smtp, 'getServiceExtensions')) {
+            if (!($net_smtp instanceof PEAR_Error)) {
                 $smtp_ext = $net_smtp->getServiceExtensions();
                 if (isset($smtp_ext['8BITMIME'])) {
                     $encode |= self::ENCODE_8BIT;
diff --git a/framework/Mime/package.xml b/framework/Mime/package.xml
index 8762c0873..f08923fd1 100644
--- a/framework/Mime/package.xml
+++ b/framework/Mime/package.xml
@@ -163,6 +163,11 @@ http://pear.php.net/dtd/package-2.0.xsd">
     <channel>pear.horde.org</channel>
    </package>
    <package>
+    <name>Mail</name>
+    <channel>pear.php.net</channel>
+    <min>1.2.0</min>
+   </package>
+   <package>
     <name>Stream_Filter</name>
     <channel>pear.horde.org</channel>
    </package>
@@ -192,6 +197,11 @@ http://pear.php.net/dtd/package-2.0.xsd">
     <channel>pear.horde.org</channel>
    </package>
    <package>
+    <name>Net_SMTP</name>
+    <channel>pear.horde.org</channel>
+    <min>1.3.0</min>
+   </package>
+   <package>
     <name>Prefs</name>
     <channel>pear.horde.org</channel>
    </package>