Ticket #1492

modules/boonex/russian/data/langs/bx_timeline/ru.xml

@@ -148,8 +148,8 @@
     <string name="_bx_timeline_menu_item_title_item_unpromote"><![CDATA[Не рекламировать]]></string>
     <string name="_bx_timeline_menu_item_title_system_item_edit"><![CDATA[Изменить]]></string>
     <string name="_bx_timeline_menu_item_title_item_edit"><![CDATA[Изменить]]></string>
-    <string name="_bx_timeline_menu_item_title_system_item_delete"><![CDATA[Удалить]]></string>
-    <string name="_bx_timeline_menu_item_title_item_delete"><![CDATA[Удалить]]></string>
+    <string name="_bx_timeline_menu_item_title_system_item_delete"><![CDATA[Скрыть]]></string>
+    <string name="_bx_timeline_menu_item_title_item_delete"><![CDATA[Скрыть]]></string>
 
 	<string name="_bx_timeline_menu_title_item_actions"><![CDATA[Элемент - Действия]]></string>
     <string name="_bx_timeline_menu_set_title_item_actions"><![CDATA[Элемент - Действия]]></string>

modules/boonex/timeline/classes/BxTimelineConfig.php

@@ -28,6 +28,7 @@ class BxTimelineConfig extends BxBaseModNotificationsConfig
     protected $_iHotInterval;
 
     protected $_bEditorToolbar;
+    protected $_bUnhideRestored;
 
     protected $_sStorageObject;
     protected $_sTranscoderObjectPreview;
@@ -274,7 +275,8 @@ class BxTimelineConfig extends BxBaseModNotificationsConfig
         $this->_iHotInterval = (int)getParam($sOptionPrefix . 'hot_interval');
 
         $this->_bEditorToolbar = getParam($sOptionPrefix . 'enable_editor_toolbar') == 'on';
-        
+
+        $this->_bUnhideRestored = false;
     }
 
     public function isAllowEdit()
@@ -302,6 +304,11 @@ class BxTimelineConfig extends BxBaseModNotificationsConfig
     	return $this->_bEditorToolbar;
     }
 
+    public function isUnhideRestored()
+    {
+        return $this->_bUnhideRestored;
+    }
+
     public function getPostFormDisplay($sType)
     {
         if(empty($sType) || !array_key_exists($sType, $this->_aTypeToFormDisplay))

modules/boonex/timeline/classes/BxTimelineDb.php

@@ -123,23 +123,23 @@ class BxTimelineDb extends BxBaseModNotificationsDb
 
 			$mixedResult = $this->_oConfig->getSystemDataByDescriptor($sType, $sAction, $iObjectId);
 			if(is_array($mixedResult)) {
-				$iOwnerId = !empty($mixedResult['owner_id']) ? (int)$mixedResult['owner_id'] : 0;
-				$iDate = !empty($mixedResult['date']) ? (int)$mixedResult['date'] : 0;
-				if(!empty($iOwnerId) && !empty($iDate))
-					$iHidden = 0;
+                            $iOwnerId = !empty($mixedResult['owner_id']) ? (int)$mixedResult['owner_id'] : 0;
+                            $iDate = !empty($mixedResult['date']) ? (int)$mixedResult['date'] : 0;
+                            if($this->_oConfig->isUnhideRestored() && !empty($iOwnerId) && !empty($iDate))
+                                $iHidden = 0;
 			}
 
 			$iId = $this->insertEvent(array(
-				'owner_id' => $iOwnerId,
-				'type' => $sType,
-				'action' => $sAction,
-				'object_id' => $iObjectId,
-				'object_privacy_view' => $this->_oConfig->getPrivacyViewDefault('object'),
-				'content' => '',
-				'title' => '',
-				'description' => '',
-				'date' => $iDate,
-				'hidden' => $iHidden
+                            'owner_id' => $iOwnerId,
+                            'type' => $sType,
+                            'action' => $sAction,
+                            'object_id' => $iObjectId,
+                            'object_privacy_view' => $this->_oConfig->getPrivacyViewDefault('object'),
+                            'content' => '',
+                            'title' => '',
+                            'description' => '',
+                            'date' => $iDate,
+                            'hidden' => $iHidden
 			));
 
 			$aReposted = $this->getEvents(array('browse' => 'id', 'value' => $iId));

modules/boonex/timeline/install/langs/en.xml

@@ -148,8 +148,8 @@
     <string name="_bx_timeline_menu_item_title_item_unpromote"><![CDATA[Unpromote]]></string>
     <string name="_bx_timeline_menu_item_title_system_item_edit"><![CDATA[Edit]]></string>
     <string name="_bx_timeline_menu_item_title_item_edit"><![CDATA[Edit]]></string>
-    <string name="_bx_timeline_menu_item_title_system_item_delete"><![CDATA[Delete]]></string>
-    <string name="_bx_timeline_menu_item_title_item_delete"><![CDATA[Delete]]></string>
+    <string name="_bx_timeline_menu_item_title_system_item_delete"><![CDATA[Hide]]></string>
+    <string name="_bx_timeline_menu_item_title_item_delete"><![CDATA[Hide from here]]></string>
 
 	<string name="_bx_timeline_menu_title_item_actions"><![CDATA[Item Actions]]></string>
     <string name="_bx_timeline_menu_set_title_item_actions"><![CDATA[Item Actions]]></string>