1
0
Эх сурвалжийг харах

Ticket #367 - Related changes in core files.

AntonLV 10 жил өмнө
parent
commit
a1b0ca01da

+ 11 - 4
template/scripts/BxBaseCategory.php

@@ -14,6 +14,7 @@
 class BxBaseCategory extends BxDolCategory
 {
     protected $_oTemplate;
+    protected $_sBrowseUrl;
 
     public function __construct ($aObject, $oTemplate = null)
     {
@@ -23,6 +24,11 @@ class BxBaseCategory extends BxDolCategory
             $this->_oTemplate = $oTemplate;
         else
             $this->_oTemplate = BxDolTemplate::getInstance();
+
+		$this->_sBrowseUrl = bx_append_url_params('searchKeyword.php', array(
+			'cat' => '{category}',
+			'keyword' => '{keyword}'
+		)) . '{sections}';
     }
 
     public function getCategoryTitle($sValue)
@@ -36,10 +42,11 @@ class BxBaseCategory extends BxDolCategory
 
     public function getCategoryUrl($sValue)
     {
-        $sUrl = BX_DOL_URL_ROOT . 'searchKeyword.php?cat=' . rawurlencode($this->getObjectName()) . '&keyword=' . rawurlencode($sValue);
-        if ($this->_aObject['search_object'])
-            $sUrl .= '&section[]=' . rawurlencode($this->_aObject['search_object']);
-        return $sUrl;
+        return BX_DOL_URL_ROOT . bx_replace_markers($this->_sBrowseUrl, array(
+        	'category' => rawurlencode($this->getObjectName()),
+        	'keyword' => rawurlencode($sValue),
+    		'sections' => $this->_aObject['search_object'] ? '&section[]=' . rawurlencode($this->_aObject['search_object']) : ''
+        ));
     }
 
     /**

+ 8 - 1
template/scripts/BxBaseServiceMetatags.php

@@ -33,6 +33,10 @@ class BxBaseServiceMetatags extends BxDol
     {
     	$iMaxCount = isset($aParams['max_count']) ? (int)$aParams['max_count'] : BX_METATAGS_KEYWORDS_IN_CLOUD;
     	$bShowEmpty = isset($aParams['show_empty']) ? (bool)$aParams['show_empty'] : false;
+    	$sBrowseUrl = isset($aParams['browse_url']) ? $aParams['browse_url'] : bx_append_url_params('searchKeyword.php', array(
+    		'type' => 'keyword', 
+    		'keyword' => '{keyword}'
+    	)) . '{sections}';
 
         $o = BxDolMetatags::getObjectInstance($sObject);
         $aKeywords = $o->keywordsPopularList($iMaxCount);
@@ -58,7 +62,10 @@ class BxBaseServiceMetatags extends BxDol
         foreach($aKeywords as $sKeyword => $iCount) {
             $aUnits[] = array(
                 'size' => $this->_iKeywordsCloudFontSizeMin + floor($iFontDiff * (($iCount - $iMinRating) / $iRatingDiff)),
-                'href' => BX_DOL_URL_ROOT . 'searchKeyword.php?type=keyword&keyword=' . rawurlencode($sKeyword) . $sSectionPart,
+                'href' => BX_DOL_URL_ROOT . bx_replace_markers($sBrowseUrl, array(
+            		'keyword' => rawurlencode($sKeyword),
+            		'sections' => $sSectionPart
+            	)),
                 'count' => $iCount,
                 'keyword' => htmlspecialchars_adv($sKeyword),
             );