Jelajahi Sumber

#26 - Minor fixes.

AntonLV 12 tahun lalu
induk
melakukan
249cfd66cc

+ 2 - 1
modules/base/general/classes/BxBaseModGeneralModule.php

@@ -191,7 +191,8 @@ class BxBaseModGeneralModule extends BxDolModule
 
 
     // ====== PROTECTED METHODS
     // ====== PROTECTED METHODS
 
 
-    protected function _serviceBrowse ($sMode, $aParams = false, $iDesignBox = BX_DB_PADDING_DEF, $bDisplayEmptyMsg = false, $bAjaxPaginate = true)
+    //TODO: Need to check and fix. When $bAjaxPaginate is TRUE, "View" selector (gallery/extended view) has an empty 'onclick'. 
+    protected function _serviceBrowse ($sMode, $aParams = false, $iDesignBox = BX_DB_PADDING_DEF, $bDisplayEmptyMsg = false, $bAjaxPaginate = false)
     {
     {
         if (CHECK_ACTION_RESULT_ALLOWED !== ($sMsg = $this->checkAllowedBrowse()))
         if (CHECK_ACTION_RESULT_ALLOWED !== ($sMsg = $this->checkAllowedBrowse()))
             return MsgBox($sMsg);
             return MsgBox($sMsg);

+ 1 - 1
modules/base/text/classes/BxBaseModTextSearchResult.php

@@ -14,7 +14,7 @@ bx_import('BxBaseModGeneralSearchResult');
 class BxBaseModTextSearchResult extends BxBaseModGeneralSearchResult
 class BxBaseModTextSearchResult extends BxBaseModGeneralSearchResult
 {
 {
     protected $aUnitViews = array('extended' => 'unit.html', 'gallery' => 'unit_gallery.html');
     protected $aUnitViews = array('extended' => 'unit.html', 'gallery' => 'unit_gallery.html');
-    protected $sUnitViewDefault = 'extended';
+    protected $sUnitViewDefault = 'gallery';
     protected $sUnitViewParamName = 'unit_view';
     protected $sUnitViewParamName = 'unit_view';
 
 
     function __construct($sMode = '', $aParams = array())
     function __construct($sMode = '', $aParams = array())

+ 5 - 3
template/scripts/BxBaseSearchResult.php

@@ -195,7 +195,7 @@ class BxBaseSearchResult extends BxDolSearchResult
 
 
         $sUrlStart = BX_DOL_URL_ROOT . $oPermalinks->permalink($this->sBrowseUrl);
         $sUrlStart = BX_DOL_URL_ROOT . $oPermalinks->permalink($this->sBrowseUrl);
 
 
-        return $this->addAdditionalUrlParams($sUrlStart, $bReplacePagesParams);
+        return $this->addAdditionalUrlParams($sUrlStart, $aAdditionalParams, $bReplacePagesParams);
     }
     }
 
 
     /**
     /**
@@ -212,7 +212,7 @@ class BxBaseSearchResult extends BxDolSearchResult
         if (BX_DOL_SEARCH_KEYWORD_PAGE === $this->sBrowseUrl) {
         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'];
-            $sLoadDynamicUrl = $this->addAdditionalUrlParams($sLoadDynamicUrl, $bReplacePagesParams);
+            $sLoadDynamicUrl = $this->addAdditionalUrlParams($sLoadDynamicUrl, $aAdditionalParams, $bReplacePagesParams);
 
 
             $sKeyword = bx_get('keyword');
             $sKeyword = bx_get('keyword');
             if ($sKeyword !== false && mb_strlen($sKeyword) > 0)
             if ($sKeyword !== false && mb_strlen($sKeyword) > 0)
@@ -227,7 +227,9 @@ class BxBaseSearchResult extends BxDolSearchResult
         }
         }
     }
     }
 
 
-    protected function addAdditionalUrlParams($sUrl, $bReplacePagesParams)
+    //TODO: $aAdditionalParams variable was used but was not initiated or even defined anywhere in the method. Additionale params were not attached to the URL because of it.
+    //So, I added the the variable as function parameter and updated method calls accordingly.
+    protected function addAdditionalUrlParams($sUrl, $aAdditionalParams, $bReplacePagesParams)
     {
     {
         // add pages params
         // add pages params
         $sUrl = bx_append_url_params($sUrl, array (
         $sUrl = bx_append_url_params($sUrl, array (