Ticket #507 - Sample's article in Share events.

modules/base/general/classes/BxBaseModGeneralModule.php

@@ -482,6 +482,7 @@ class BxBaseModGeneralModule extends BxDolModule
             'owner_id' => $aContentInfo[$CNF['FIELD_AUTHOR']],
             'icon' => !empty($CNF['ICON']) ? $CNF['ICON'] : '',
         	'sample' => isset($CNF['T']['txt_sample_single_with_article']) ? $CNF['T']['txt_sample_single_with_article'] : $CNF['T']['txt_sample_single'],
+        	'sample_wo_article' => $CNF['T']['txt_sample_single'],
     	    'sample_action' => isset($CNF['T']['txt_sample_single_action']) ? $CNF['T']['txt_sample_single_action'] : '',
             'content' => $this->_getContentForTimelinePost($aEvent, $aContentInfo), //a string to display or array to parse default template before displaying.
             'date' => $aContentInfo[$CNF['FIELD_ADDED']],
@@ -764,6 +765,7 @@ class BxBaseModGeneralModule extends BxDolModule
 
     	return array(
     		'sample' => isset($CNF['T']['txt_sample_single_with_article']) ? $CNF['T']['txt_sample_single_with_article'] : $CNF['T']['txt_sample_single'],
+    		'sample_wo_article' => $CNF['T']['txt_sample_single'],
     	    'sample_action' => isset($CNF['T']['txt_sample_single_action']) ? $CNF['T']['txt_sample_single_action'] : '',
 			'url' => $sUrl,
 			'title' => isset($CNF['FIELD_TITLE']) && isset($aContentInfo[$CNF['FIELD_TITLE']]) ? $aContentInfo[$CNF['FIELD_TITLE']] : 

modules/boonex/timeline/classes/BxTimelineTemplate.php

@@ -961,10 +961,12 @@ class BxTimelineTemplate extends BxBaseModNotificationsTemplate
             'owner_id' => $aEvent['object_id'],
             'icon' => $CNF['ICON'],
         	'sample' => '_bx_timeline_txt_sample_with_article',
+            'sample_wo_article' => '_bx_timeline_txt_sample',
         	'sample_action' => '_bx_timeline_txt_added_sample',
             'content_type' => $sType,
             'content' => array(
-                'sample' => '_bx_timeline_txt_sample',
+                'sample' => '_bx_timeline_txt_sample_with_article',
+        		'sample_wo_article' => '_bx_timeline_txt_sample',
         		'sample_action' => '_bx_timeline_txt_added_sample',
                 'url' => $this->_oConfig->getItemViewUrl($aEvent)
             ), //a string to display or array to parse default template before displaying.
@@ -1048,10 +1050,13 @@ class BxTimelineTemplate extends BxBaseModNotificationsTemplate
                 $aResult['content']['owner_id'] = $aShared['owner_id'];
                 list($aResult['content']['owner_name'], $aResult['content']['owner_url']) = $oModule->getUserInfo($aShared['owner_id']);
 
-                list($sUserName) = $oModule->getUserInfo($aEvent['object_id']);
-                $sSample = !empty($aResult['content']['sample']) ? $aResult['content']['sample'] : '_bx_timeline_txt_sample';
+                if(!empty($aShared['sample']))
+                    $aResult['content']['sample'] = $aShared['sample'];
+                if(!empty($aShared['sample_wo_article']))
+                    $aResult['content']['sample'] = $aShared['sample_wo_article'];
 
-                $aResult['title'] = _t('_bx_timeline_txt_user_shared_sample', $sUserName, $aResult['content']['owner_name'], _t($sSample));
+                list($sUserName) = $oModule->getUserInfo($aEvent['object_id']);
+                $aResult['title'] = _t('_bx_timeline_txt_user_shared_sample', $sUserName, $aResult['content']['owner_name'], _t($aResult['content']['sample']));
                 $aResult['description'] = '';
                 break;
         }