Merge branch 'master' of github.com:ezsystems/ezpublish

ezsystems · Aug 10, 2010 · 8f826b2 · 8f826b2
2 parents fd822ae + 60da4a1
commit 8f826b2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/doc/changelogs/4.4/unstable/CHANGELOG-4.4.0alpha5-to-4.4.0alpha6 b/doc/changelogs/4.4/unstable/CHANGELOG-4.4.0alpha5-to-4.4.0alpha6
@@ -11,6 +11,7 @@ Changes from 4.4.0alpha5 to 4.4.0alpha6
 - Implemented enhancement #017080: Optimize eZINI input file lookup
 - Implemented enhancement #017081: Provide a simple api to load siteaccess globally & on ini instance
 - Implemented enhancement #017082: Clean-up ini loading inconsistency regarding ActiveAccessExtensions SA
+- Implemented enhancement #017087: Mixing of html and text within a single email for a digest mail
 
 *Design:
 

diff --git a/kernel/classes/notification/handler/ezgeneraldigest/ezgeneraldigesthandler.php b/kernel/classes/notification/handler/ezgeneraldigest/ezgeneraldigesthandler.php
@@ -141,8 +141,13 @@ function handle( $event )
                 $tpl->setVariable( 'address', $address['address'] );
                 $result = $tpl->fetch( 'design:notification/handler/ezgeneraldigest/view/plain.tpl' );
                 $subject = $tpl->variable( 'subject' );
+
+                $parameters = array();
+                if ( $tpl->hasVariable( 'content_type' ) )
+                    $parameters['content_type'] = $tpl->variable( 'content_type' );
+
                 $transport = eZNotificationTransport::instance( 'ezmail' );
-                $transport->send( $address, $subject, $result);
+                $transport->send( $address, $subject, $result, null, $parameters );
                 eZDebugSetting::writeDebug( 'kernel-notification', $result, "digest result" );
             }