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

Ticket #5737 - Text Based: PHP warnings on view content page when Cover is disabled.

AntonLV 3 недель назад
Родитель
Сommit
19b33e93ae
2 измененных файлов с 11 добавлено и 9 удалено
  1. 1 1
      inc/classes/BxDolTemplate.php
  2. 10 8
      template/scripts/BxBaseCover.php

+ 1 - 1
inc/classes/BxDolTemplate.php

@@ -867,7 +867,7 @@ class BxDolTemplate extends BxDolFactory implements iBxDolSingleton
      */
     function getPageHeader()
     {
-        return $this->aPage['header'];
+        return $this->aPage['header'] ?? '';
     }
 
     /**

+ 10 - 8
template/scripts/BxBaseCover.php

@@ -109,14 +109,16 @@ class BxBaseCover extends BxDolCover
      */
     public function displayEmpty ()
     {
-        $sTitle = $this->_oTemplate->getPageHeader();
-
-        return $this->_oTemplate->parseHtmlByName($this->_sTemplateNameEmpty, array(
-            'bx_if:title' => array(
-                'condition' => !empty($sTitle),
-                'content' => array('title' => bx_process_output(strip_tags($sTitle))),
-            ),
-        ));
+        $aTmplVarsTitle = ($sTitle = $this->_oTemplate->getPageHeader()) ? [
+            'title' => bx_process_output(strip_tags($sTitle))
+        ] : false;
+
+        return $this->_oTemplate->parseHtmlByName($this->_sTemplateNameEmpty, [
+            'bx_if:title' => [
+                'condition' => $aTmplVarsTitle !== false,
+                'content' => $aTmplVarsTitle,
+            ],
+        ]);
     }
 
     /**