--- a/web/lib/Zend/Application/Resource/Mail.php	Thu Mar 21 17:31:31 2013 +0100
+++ b/web/lib/Zend/Application/Resource/Mail.php	Thu Mar 21 19:50:53 2013 +0100
@@ -15,9 +15,9 @@
  * @category   Zend
  * @package    Zend_Application
  * @subpackage Resource
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Mail.php 21015 2010-02-11 01:56:02Z freak $
+ * @version    $Id: Mail.php 24593 2012-01-05 20:35:02Z matthew $
  */
 
 /**
@@ -32,7 +32,7 @@
  * @category   Zend
  * @package    Zend_Application
  * @subpackage Resource
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Application_Resource_Mail extends Zend_Application_Resource_ResourceAbstract
@@ -46,7 +46,7 @@
     public function init() {
         return $this->getMail();
     }
-    
+
     /**
      *
      * @return Zend_Mail_Transport_Abstract|null
@@ -56,7 +56,7 @@
         if (null === $this->_transport) {
             $options = $this->getOptions();
             foreach($options as $key => $option) {
-                $options[strtolower($key)] = $option;         
+                $options[strtolower($key)] = $option;
             }
             $this->setOptions($options);
 
@@ -73,14 +73,14 @@
                     Zend_Mail::setDefaultTransport($this->_transport);
                 }
             }
-            
+
             $this->_setDefaults('from');
             $this->_setDefaults('replyTo');
         }
 
         return $this->_transport;
     }
-    
+
     protected function _setDefaults($type) {
         $key = strtolower('default' . $type);
         $options = $this->getOptions();
@@ -99,13 +99,13 @@
             }
         }
     }
-    
+
     protected function _setupTransport($options)
     {
-    	if(!isset($options['type'])) {
-    		$options['type'] = 'sendmail';
-    	}
-    	
+        if(!isset($options['type'])) {
+            $options['type'] = 'sendmail';
+        }
+        
         $transportName = $options['type'];
         if(!Zend_Loader_Autoloader::autoload($transportName))
         {
@@ -122,9 +122,10 @@
                 }
             }
         }
-        
+
         unset($options['type']);
-        
+        unset($options['register']); //@see ZF-11022
+
         switch($transportName) {
             case 'Zend_Mail_Transport_Smtp':
                 if(!isset($options['host'])) {
@@ -132,7 +133,7 @@
                         'A host is necessary for smtp transport,'
                         .' but none was given');
                 }
-                
+
                 $transport = new $transportName($options['host'], $options);
                 break;
             case 'Zend_Mail_Transport_Sendmail':