Преглед изворни кода

Ticket #4779 - Albums: Notifications about new Comment/Vote for album's content stopped working.

AntonLV пре 2 година
родитељ
комит
8bdf67f202

+ 3 - 0
modules/boonex/albums/classes/BxAlbumsModule.php

@@ -672,6 +672,7 @@ class BxAlbumsModule extends BxBaseModTextModule
         $sEntryCaption = isset($aMediaInfo['title']) ? $aMediaInfo['title'] : _t('_bx_albums_media');
 
         return array(
+            'object_id' => $aMediaInfo['content_id'],
             'entry_sample' => $CNF['T']['txt_media_single'],
             'entry_url' => $sEntryUrl,
             'entry_caption' => $sEntryCaption,
@@ -699,6 +700,7 @@ class BxAlbumsModule extends BxBaseModTextModule
         $sEntryCaption = isset($aMediaInfo['title']) ? $aMediaInfo['title'] : _t('_bx_albums_media');
 
         return array(
+            'object_id' => $aMediaInfo['content_id'],
             'entry_sample' => $CNF['T']['txt_media_single'],
             'entry_url' => $sEntryUrl,
             'entry_caption' => $sEntryCaption,
@@ -736,6 +738,7 @@ class BxAlbumsModule extends BxBaseModTextModule
         $sEntryCaption = isset($aMediaInfo['title']) ? $aMediaInfo['title'] : _t('_bx_albums_media');
 
         return array(
+            'object_id' => $aMediaInfo['content_id'],
             'entry_sample' => $CNF['T']['txt_media_single'],
             'entry_url' => $sEntryUrl,
             'entry_caption' => $sEntryCaption,

+ 6 - 2
modules/boonex/notifications/classes/BxNtfsConfig.php

@@ -255,9 +255,13 @@ class BxNtfsConfig extends BxBaseModNotificationsConfig
     public function getContentObjectId(&$aEvent)
     {
         $bContentObjectId = !empty($aEvent['content']['object_id']);
+        if(!$bContentObjectId) {
+            if(in_array($aEvent['action'], ['replyPost']))
+                return false;
 
-        if(in_array($aEvent['action'], ['replyPost']) && !$bContentObjectId)
-            return false;
+            if(strpos($aEvent['type'], '_media') !== false && in_array($aEvent['action'], ['commentPost', 'doVote', 'doVoteUp', 'doVoteDown']))
+                return false;
+        }
 
         return $bContentObjectId ? (int)$aEvent['content']['object_id'] : (int)$aEvent['object_id'];
     }