Merge branch 'master' of https://github.com/boonex/dolphin

studio/classes/BxDolStudioInstaller.php

@@ -580,7 +580,7 @@ class BxDolStudioInstaller extends BxDolInstallerUtils
                 break;
         }
 
-        $mixedResult = $this->oDb->executeSQL($this->_sHomePath . 'install/sql/' . $sOperation . '.sql');
+        $mixedResult = $this->oDb->executeSQL($this->_sHomePath . 'install/sql/' . $sOperation . '.sql', $this->getMarkersForDb());
 
         return $mixedResult === true ? BX_DOL_STUDIO_INSTALLER_SUCCESS : array('code' => BX_DOL_STUDIO_INSTALLER_FAILED, 'content' => $mixedResult);
     }
@@ -786,6 +786,14 @@ class BxDolStudioInstaller extends BxDolInstallerUtils
 
 		return $bCompatible;
     }
+
+    protected function getMarkersForDb()
+    {
+        return array(
+            'from' => array('{db_name}'),
+            'to' => array(defined('BX_DATABASE_NAME') ? BX_DATABASE_NAME : ''),
+        );
+    }
 }
 
 /** @} */

studio/classes/BxDolStudioUpdater.php

@@ -144,10 +144,10 @@ class BxDolStudioUpdater extends BxDolStudioInstaller
 
     	$mixedResult = true;
     	if(file_exists($sPathInstall))
-        	$mixedResult = $this->oDb->executeSQL($sPathInstall);
+        	$mixedResult = $this->oDb->executeSQL($sPathInstall, $this->getMarkersForDb());
 
 		if($mixedResult === true && (int)$aModule['enabled'] == 1 && file_exists($sPathEnable))
-			$mixedResult = $this->oDb->executeSQL($sPathEnable);
+			$mixedResult = $this->oDb->executeSQL($sPathEnable, $this->getMarkersForDb());
 
         return $mixedResult === true ? BX_DOL_STUDIO_INSTALLER_SUCCESS : array('code' => BX_DOL_STUDIO_INSTALLER_FAILED, 'content' => $mixedResult);
     }

template/css/default.less

@@ -495,10 +495,10 @@ h3,
     overflow:hidden;
     .box-sizing();
 }
-div[min-width~="480px"][max-width~="720px"] .bx-def-gal-unit-size {
+div.bx-search-result-block[min-width~="480px"][max-width~="720px"] .bx-def-gal-unit-size {
     width:50%;
 }
-div[min-width~="720px"] .bx-def-gal-unit-size {
+div.bx-search-result-block[min-width~="720px"] .bx-def-gal-unit-size {
     width:33.3%;
 }
 

upgrade/classes/BxDolUpgradeUtil.php

@@ -84,8 +84,8 @@ class BxDolUpgradeUtil
             if (!$aModule)
                 return true; // it looks like module is not installed - skip it
             $aReplace = array (
-                'from' => array ('[db_prefix]'),
-                'to'   => array ($aModule['db_prefix']),
+                'from' => array ('{db_prefix}', '{db_name}'),
+                'to'   => array ($aModule['db_prefix'], defined('BX_DATABASE_NAME') ? BX_DATABASE_NAME : ''),
             );
         }