Ticket #1046

modules/boonex/notifications/classes/BxNtfsResponse.php

@@ -234,10 +234,14 @@ class BxNtfsResponse extends BxBaseModNotificationsResponse
             if(!method_exists($this->_oModule->_oTemplate, $sMethodGet) || !method_exists($this, $sMethodSend))
                 continue;
 
+            $mixedContent = $this->_oModule->_oTemplate->$sMethodGet($aEvent);
+            if($mixedContent === false)
+                continue;
+
             //--- Get event.
             $aTypesToSend[$sType] = array(
             	'method' => $sMethodSend,
-                'content' => $this->_oModule->_oTemplate->$sMethodGet($aEvent)
+                'content' => $mixedContent
             );
         }
 

modules/boonex/notifications/classes/BxNtfsTemplate.php

@@ -137,8 +137,8 @@ class BxNtfsTemplate extends BxBaseModNotificationsTemplate
     public function getNotificationEmail(&$aEvent)
     {
         $sEvent = $this->getPost($aEvent);
-        if(empty($sEvent))
-            return;
+        if(empty($sEvent) || empty($aEvent['content_parsed']))
+            return false;
 
         return $this->parseHtmlByName('et_new_event.html', array(
         	'icon_url' => !empty($aEvent['content']['owner_icon']) ? $aEvent['content']['owner_icon'] : $this->getIconUrl('std-icon.svg'),
@@ -151,13 +151,16 @@ class BxNtfsTemplate extends BxBaseModNotificationsTemplate
     public function getNotificationPush(&$aEvent)
     {
         $sEvent = $this->getPost($aEvent);
-        if(empty($sEvent))
-            return;
+        if(empty($sEvent) || empty($aEvent['content_parsed']))
+            return false;
 
         $sMessage = preg_replace('/<\/?[a-zA-Z0-9=\'":;\(\)\s_-]+>/i', '"', $aEvent['content_parsed']);
 		if($sMessage)
             $sMessage = BxTemplFunctions::getInstance()->getStringWithLimitedLength(html_entity_decode($sMessage), $this->_oConfig->getPushMaxLen());
 
+        if(empty($sMessage))
+            return false;
+
         return array(
             'url' => $this->_getContentLink($aEvent),
             'message' => $sMessage,