From df4462611cc71f785c4d8f05d7cebe695c12f6b9 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Sat, 1 May 2010 09:51:07 -0700
Subject: Revert "Update PEAR::Mail to 1.2.0 release; fixes deprecation
 warnings running under PHP 5.3."

This reverts commit 9fd02a4f11881b3e0e1b3029c7c9e85a799c5ced.

Looks like there's some changes I missed in there and getting this in'll involve updating some other packages. Will poke it after 0.9.2.
---
 extlib/Mail/sendmail.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
 mode change 100755 => 100644 extlib/Mail/sendmail.php

(limited to 'extlib/Mail/sendmail.php')

diff --git a/extlib/Mail/sendmail.php b/extlib/Mail/sendmail.php
old mode 100755
new mode 100644
index b056575e9..cd248e61d
--- a/extlib/Mail/sendmail.php
+++ b/extlib/Mail/sendmail.php
@@ -20,7 +20,7 @@
  * Sendmail implementation of the PEAR Mail:: interface.
  * @access public
  * @package Mail
- * @version $Revision: 294744 $
+ * @version $Revision: 1.19 $
  */
 class Mail_sendmail extends Mail {
 
@@ -117,7 +117,7 @@ class Mail_sendmail extends Mail {
         if (is_a($recipients, 'PEAR_Error')) {
             return $recipients;
         }
-        $recipients = implode(' ', array_map('escapeshellarg', $recipients));
+        $recipients = escapeShellCmd(implode(' ', $recipients));
 
         $headerElements = $this->prepareHeaders($headers);
         if (is_a($headerElements, 'PEAR_Error')) {
@@ -141,8 +141,7 @@ class Mail_sendmail extends Mail {
             return PEAR::raiseError('From address specified with dangerous characters.');
         }
 
-        $from = escapeshellarg($from); // Security bug #16200
-
+        $from = escapeShellCmd($from);
         $mail = @popen($this->sendmail_path . (!empty($this->sendmail_args) ? ' ' . $this->sendmail_args : '') . " -f$from -- $recipients", 'w');
         if (!$mail) {
             return PEAR::raiseError('Failed to open sendmail [' . $this->sendmail_path . '] for execution.');
-- 
cgit v1.2.3-54-g00ecf