Просмотр исходного кода

Ticket #4004 - Timeline: canonical URL isn't properly generated.

AntonLV 4 лет назад
Родитель
Сommit
8b67502f09

+ 7 - 7
modules/boonex/timeline/classes/BxTimelinePageViewItem.php

@@ -29,21 +29,21 @@ class BxTimelinePageViewItem extends BxBaseModTextPageAuthor
 
         $this->_iItemId = $iItemId;
     }
-    
+
     public function getCode()
     {
         $aItemData = $this->_oModule->getItemData($this->_iItemId);
 
-        if(empty($aItemData) || !is_array($aItemData)) {
-            $this->_oTemplate->displayPageNotFound();
-            exit;
-        }
-
         if($aItemData['code'] != 0) {
-            $this->_oTemplate->displayMsg($aItemData['content']);
+            if($aItemData['code'] == 1)
+                $this->_oTemplate->displayPageNotFound();
+            else
+                $this->_oTemplate->displayMsg($aItemData['content']);
             exit;
         }
 
+        BxDolTemplate::getInstance()->setPageUrl('page.php?i=' . $this->_aObject['uri'] . '&id=' . $this->_iItemId);
+
         return parent::getCode();
     }
 }

+ 2 - 2
modules/boonex/timeline/install/sql/enable.sql

@@ -12,8 +12,8 @@ INSERT INTO `sys_objects_page`(`object`, `title_system`, `title`, `module`, `lay
 ('bx_timeline_view_home', '_bx_timeline_page_title_sys_view_home', '_bx_timeline_page_title_view_home', 'bx_timeline', 5, 2147483647, 1, 'timeline-view-home', 'page.php?i=timeline-view-home', '', '', '', 0, 1, 0, '', ''),
 ('bx_timeline_view_hot', '_bx_timeline_page_title_sys_view_hot', '_bx_timeline_page_title_view_hot', 'bx_timeline', 5, 2147483647, 1, 'timeline-view-hot', 'page.php?i=timeline-view-hot', '', '', '', 0, 1, 0, '', ''),
 
-('bx_timeline_item', '_bx_timeline_page_title_sys_item', '_bx_timeline_page_title_item', 'bx_timeline', 2, 2147483647, 1, 'item', 'page.php?i=item', '', '', '', 0, 1, 0, 'BxTimelinePageViewItem', 'modules/boonex/timeline/classes/BxTimelinePageViewItem.php'),
-('bx_timeline_item_brief', '_bx_timeline_page_title_sys_item_brief', '_bx_timeline_page_title_item_brief', 'bx_timeline', 5, 2147483647, 1, 'item-quick', 'page.php?i=item-quick', '', '', '', 0, 1, 0, 'BxTimelinePageViewItem', 'modules/boonex/timeline/classes/BxTimelinePageViewItem.php'),
+('bx_timeline_item', '_bx_timeline_page_title_sys_item', '_bx_timeline_page_title_item', 'bx_timeline', 2, 2147483647, 1, 'item', '', '', '', '', 0, 1, 0, 'BxTimelinePageViewItem', 'modules/boonex/timeline/classes/BxTimelinePageViewItem.php'),
+('bx_timeline_item_brief', '_bx_timeline_page_title_sys_item_brief', '_bx_timeline_page_title_item_brief', 'bx_timeline', 5, 2147483647, 1, 'item-quick', '', '', '', '', 0, 1, 0, 'BxTimelinePageViewItem', 'modules/boonex/timeline/classes/BxTimelinePageViewItem.php'),
 
 ('bx_timeline_manage', '_bx_timeline_page_title_sys_manage', '_bx_timeline_page_title_manage', 'bx_timeline', 5, 2147483647, 1, 'timeline-manage', 'page.php?i=timeline-manage', '', '', '', 0, 1, 0, '', '');