Browse Source

Merge branch 'master' of https://github.com/unaio/una

AntonLV 8 years ago
parent
commit
e46ab2f21f

+ 1 - 0
modules/boonex/fontawesome/classes/BxFontAwesomeModule.php

@@ -20,6 +20,7 @@ class BxFontAwesomeModule extends BxDolModule
     {
         $this->_oDb->switchLightFont($bEnable);
         BxDolCacheUtilities::getInstance()->clear('css');
+        BxDolCacheUtilities::getInstance()->clear('db');
     }
 }
 

+ 1 - 1
studio/template/scripts/BxBaseStudioStore.php

@@ -47,7 +47,7 @@ class BxBaseStudioStore extends BxDolStudioStore
         	'categories' => array('icon' => 'tag'),
         	'search' => array('icon' => 'search'),
 	        'purchases' => array('icon' => 'shopping-cart'), 
-	        'updates' => array('icon' => 'refresh'), 
+	        'updates' => array('icon' => 'sync'), 
 	        'checkout' => array('icon' => 'credit-card'), 
 	        'downloaded' => array('icon' => 'list')
         );

+ 2 - 2
template/scripts/BxBaseFormView.php

@@ -1092,8 +1092,8 @@ BLAH;
 
     protected function genCustomViewRowValueLabels ($aInput)
     {        
-        if (!$aInput['value'] || !is_array($aInput['value']) || !($oMetatags = BxDolMetatags::getObjectInstance($aInput['meta_object'])) || !$oMetatags->keywordsIsEnabled())
-            return '';
+        if (empty($aInput['value']) || !is_array($aInput['value']) || !($oMetatags = BxDolMetatags::getObjectInstance($aInput['meta_object'])) || !$oMetatags->keywordsIsEnabled())
+            return null;
 
         $s = ''; 
         foreach ($aInput['value'] as $sLabel)