浏览代码

Ticket #3868 - Disabling covers disables submenu sitewide

AntonLV 4 年之前
父节点
当前提交
09da94210e
共有 3 个文件被更改,包括 10 次插入 和 8 次删除
  1. 8 0
      inc/classes/BxDolCover.php
  2. 2 5
      inc/classes/BxDolTemplate.php
  3. 0 3
      template/scripts/BxBaseCover.php

+ 8 - 0
inc/classes/BxDolCover.php

@@ -109,6 +109,14 @@ class BxDolCover extends BxDolFactory implements iBxDolSingleton
         return $o->getFileUrlById($mixedImage['id']);
     }
 
+    /**
+     * Determine whether cover is enabled globally or not.
+     */
+    public function isEnabled()
+    {
+        return getParam('sys_site_cover_disabled') != 'on';
+    }
+
     /**
      * Determine whether cover is already set for the page or not.  
      */

+ 2 - 5
inc/classes/BxDolTemplate.php

@@ -1673,12 +1673,9 @@ class BxDolTemplate extends BxDolFactory implements iBxDolSingleton
                 break;
             case 'cover':
             	$oCover = BxDolCover::getInstance($this);
-            	if(!$oCover)
-                    break;
 
-            	$bCover = true;
-            	$oPage = BxDolPage::getObjectInstanceByURI();
-            	if($oPage !== false) {
+            	$bCover = $oCover->isEnabled();
+            	if($bCover && ($oPage = BxDolPage::getObjectInstanceByURI()) !== false) {
                     $bCover = $oPage->isPageCover();
                     if($bCover && !$oCover->isCover()) {
                         $aCover = $oPage->getPageCoverImage();

+ 0 - 3
template/scripts/BxBaseCover.php

@@ -32,9 +32,6 @@ class BxBaseCover extends BxDolCover
      */
     public function display ()
     {
-        if (getParam('sys_site_cover_disabled') == 'on')
-            return '';
-
         $this->_addJsCss();
 
         $sResult = null;