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

studio/template/launcher.html

@@ -8,6 +8,3 @@ var __js_object__ = new BxDolStudioLauncher({
 __includes__
 <div class="bx-std-launcher">__items__</div>
 <div class="bx-std-cb"></div>
-<bx_if:show_tour>
-	<bx_include_auto:launcher_tour.html />
-</bx_if:show_tour>

studio/template/scripts/BxBaseStudioLauncher.php

@@ -73,17 +73,16 @@ class BxBaseStudioLauncher extends BxDolStudioLauncher
         foreach($this->aIncludes as $sName => $oInclude)
             $sIncludes .= $oInclude->getJsCode();
 
-        return BxDolStudioTemplate::getInstance()->parseHtmlByName('launcher.html', array(
+        $s = BxDolStudioTemplate::getInstance()->parseHtmlByName('launcher.html', array(
             'js_object' => $this->getPageJsObject(),
             'includes' => $sIncludes,
             'items' => parent::getPageCode($bHidden),
-        	'bx_if:show_tour' => array(
-        		'condition' => getParam('site_tour_studio') == 'on',
-        		'content' => array(
-        			'tour_theme' => $this->_sTourTheme,
-        		)
-        	)
         ));
+
+        if (getParam('site_tour_studio') == 'on')
+            $s .= BxDolStudioTemplate::getInstance()->parseHtmlByName('launcher_tour.html', array('tour_theme' => $this->_sTourTheme));
+
+        return $s;
     }
 
 	public function serviceGetCacheUpdater()

template/scripts/BxBaseSearchResult.php

@@ -224,7 +224,7 @@ class BxBaseSearchResult extends BxDolSearchResult
 
         if (BX_DOL_SEARCH_KEYWORD_PAGE === $this->sBrowseUrl) {
 
-            $sLoadDynamicUrl = BX_DOL_URL_ROOT . 'searchKeywordContent.php?searchMode=ajax&section[]=' . $this->aCurrent['name'];
+            $sLoadDynamicUrl = BX_DOL_URL_ROOT . 'searchKeywordContent.php?searchMode=ajax&section[]=' . $this->aCurrent['name'] . ($this->_sCategoryObject ? '&cat=' . $this->_sCategoryObject : '');
             $sLoadDynamicUrl = $this->addAdditionalUrlParams($sLoadDynamicUrl, $aAdditionalParams, $bReplacePagesParams);
 
             $sKeyword = bx_get('keyword');