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

+ 1 - 0
modules/boonex/english/data/langs/system/en.xml

@@ -2674,6 +2674,7 @@ If it is not enabled then please consider implement this optimization, since it
     <string name="_sys_txt_my_profiles"><![CDATA[Create a new profile]]></string>
     <string name="_sys_txt_new_picture"><![CDATA[New Picture]]></string>
     <string name="_sys_txt_no_picture_uploaded"><![CDATA[No picture uploaded]]></string>
+    <string name="_sys_txt_no_title"><![CDATA[No title]]></string>
     <string name="_sys_txt_n_by"><![CDATA[{0} by]]></string>
     <string name="_sys_txt_n_friends"><![CDATA[{0} friends]]></string>
     <string name="_sys_txt_n_mutual_friends"><![CDATA[{0} mutual friends]]></string>

+ 12 - 9
modules/boonex/files/classes/BxFilesTemplate.php

@@ -36,24 +36,27 @@ class BxFilesTemplate extends BxBaseModTextTemplate
     
     function unit ($aData, $isCheckPrivateContent = true, $sTemplateName = 'unit.html', $aParams = array())
     {
-    	$sResult = $this->checkPrivacy ($aData, $isCheckPrivateContent, $this->getModule(), $sTemplateName);
+        $oModule = $this->getModule();
+
+    	$sResult = $this->checkPrivacy ($aData, $isCheckPrivateContent, $oModule, $sTemplateName);
     	if($sResult)
             return $sResult;
 
-        $CNF = &BxDolModule::getInstance($this->MODULE)->_oConfig->CNF;
-
-        $aParams['template_name'] = $sTemplateName;
-        $aVars = $this->getUnit($aData, $aParams);
+        $CNF = &$oModule->_oConfig->CNF;
 
-        $aFile = BxDolModule::getInstance($this->MODULE)->getContentFile($aData);
-        
+        $aFile = $oModule->getContentFile($aData);
         $oStorage = BxDolStorage::getObjectInstance($CNF['OBJECT_STORAGE']);
 
+        if(isset($CNF['FIELD_TITLE']) && empty($aData[$CNF['FIELD_TITLE']]))
+            $aData[$CNF['FIELD_TITLE']] = _t('_sys_txt_no_title');
+
+        $aParams['template_name'] = $sTemplateName;
+        $aVars = $this->getUnit($aData, $aParams);
         $aVars['icon'] = $oStorage ? $oStorage->getFontIconNameByFileName($aFile['file_name']) : 'far file';
-        if ($sTemplateName == 'unit_gallery.html') 
+        if($sTemplateName == 'unit_gallery.html') 
             $aVars['bx_if:no_thumb']['content']['icon'] = $aVars['icon'];
 
-		return $this->parseHtmlByName($sTemplateName, $aVars);
+        return $this->parseHtmlByName($sTemplateName, $aVars);
     }
 
     public function entryFilePreview ($aData)

+ 2 - 2
modules/boonex/photos/classes/BxPhotosTemplate.php

@@ -165,8 +165,8 @@ class BxPhotosTemplate extends BxBaseModTextTemplate
             unset($aParams['context']);
         }
 
-        if (empty($aData['title']))
-            $aData['title'] = _t('_bx_photos_txt_no_title');
+        if(isset($CNF['FIELD_TITLE']) && empty($aData[$CNF['FIELD_TITLE']]))
+            $aData[$CNF['FIELD_TITLE']] = _t('_sys_txt_no_title');
 
         $aResult = parent::getUnit($aData, $aParams);
         $aResult['bx_if:thumb']['content']['content_onclick'] = !empty($sMode) ? $this->_oConfig->getJsObject('main') . ".viewEntry(" . $aData[$CNF['FIELD_ID']] . ", '" . $sMode . "', " . bx_html_attribute(json_encode($aParams)) . "); return false;" : "";

+ 0 - 1
modules/boonex/photos/install/langs/en.xml

@@ -224,5 +224,4 @@
     <string name="_bx_photos_txt_n_views"><![CDATA[{0} views]]></string>
     <string name="_bx_photos_txt_previous"><![CDATA[Previous]]></string>
     <string name="_bx_photos_txt_next"><![CDATA[Next]]></string>
-    <string name="_bx_photos_txt_no_title"><![CDATA[No title]]></string>
 </resources>

+ 0 - 1
modules/boonex/russian/data/langs/bx_photos/ru.xml

@@ -226,5 +226,4 @@
     <string name="_bx_photos_txt_n_views"><![CDATA[{0} просмотров]]></string>
     <string name="_bx_photos_txt_previous"><![CDATA[Предыдущее фото]]></string>
     <string name="_bx_photos_txt_next"><![CDATA[Следующее фото]]></string>
-    <string name="_bx_photos_txt_no_title"><![CDATA[Без заголовка]]></string>
 </resources>

+ 1 - 0
modules/boonex/russian/data/langs/system/ru.xml

@@ -2669,6 +2669,7 @@
     <string name="_sys_txt_my_profiles"><![CDATA[Создать новый профайл]]></string>
     <string name="_sys_txt_new_picture"><![CDATA[Новая картинка]]></string>
     <string name="_sys_txt_no_picture_uploaded"><![CDATA[Картинка не загружена]]></string>
+    <string name="_sys_txt_no_title"><![CDATA[Без заголовка]]></string>
     <string name="_sys_txt_n_by"><![CDATA[{0}]]></string>
     <string name="_sys_txt_n_friends"><![CDATA[{0} друзей]]></string>
     <string name="_sys_txt_n_mutual_friends"><![CDATA[{0} общих друзей]]></string>