#87 - pagination in hashtags search results didn't work

modules/base/general/classes/BxBaseModGeneralCmtsSearchResult.php

@@ -23,6 +23,7 @@ class BxBaseModGeneralCmtsSearchResult extends BxBaseModGeneralSearchResult
 
         $this->aCurrent = array(
         	'name' => $this->oModule->_oConfig->getName() . '_cmts',
+        	'module_name' => $this->oModule->_oConfig->getName(),
         	'title' => '',
             'table' => $this->oModule->_oConfig->getDbPrefix() . 'cmts',
             'ownFields' => array('cmt_id', 'cmt_object_id', 'cmt_author_id', 'cmt_text', 'cmt_time'),

modules/base/general/classes/BxBaseModGeneralSearchResult.php

@@ -20,7 +20,7 @@ class BxBaseModGeneralSearchResult extends BxTemplSearchResult
 
     function getMain()
     {
-        return BxDolModule::getInstance($this->aCurrent['name']);
+        return BxDolModule::getInstance($this->aCurrent['module_name']);
     }
 
     function getRssUnitLink (&$a)

modules/boonex/accounts/classes/BxAccntSearchResult.php

@@ -17,6 +17,7 @@ class BxAccntSearchResult extends BxBaseModGeneralSearchResult
 
         $this->aCurrent =  array(
             'name' => 'bx_accounts',
+            'module_name' => 'bx_accounts',
             'object_metatags' => '',
             'title' => _t('_bx_accnt_page_title_browse'),
             'table' => 'sys_accounts',

modules/boonex/albums/classes/BxAlbumsSearchResult.php

@@ -22,6 +22,7 @@ class BxAlbumsSearchResult extends BxBaseModTextSearchResult
 
         $this->aCurrent = array(
             'name' => 'bx_albums',
+            'module_name' => 'bx_albums',
             'object_metatags' => 'bx_albums',
             'title' => _t('_bx_albums_page_title_browse'),
             'table' => 'bx_albums_albums',

modules/boonex/albums/classes/BxAlbumsSearchResultMedia.php

@@ -25,7 +25,8 @@ class BxAlbumsSearchResultMedia extends BxBaseModTextSearchResult
         parent::__construct($sMode, $aParams);
 
         $this->aCurrent = array(
-            'name' => 'bx_albums',
+            'name' => 'bx_albums_media',
+            'module_name' => 'bx_albums',
             'object_metatags' => 'bx_albums_media',
             'title' => _t('_bx_albums_media'),
             'table' => 'bx_albums_files2albums',

modules/boonex/albums/classes/BxAlbumsSearchResultMediaCamera.php

@@ -17,6 +17,7 @@ class BxAlbumsSearchResultMediaCamera extends BxAlbumsSearchResultMedia
     function __construct($sMode = '', $aParams = array())
     {
         parent::__construct($sMode, $aParams);
+        $this->aCurrent['name'] = 'bx_albums_media_camera';
         $this->aCurrent['object_metatags'] = 'bx_albums_media_camera';
     }
 }

modules/boonex/organizations/classes/BxOrgsSearchResult.php

@@ -17,6 +17,7 @@ class BxOrgsSearchResult extends BxBaseModProfileSearchResult
 
         $this->aCurrent =  array(
             'name' => 'bx_organizations',
+            'module_name' => 'bx_organizations',
             'object_metatags' => 'bx_organizations',
             'title' => _t('_bx_orgs_page_title_browse'),
             'table' => 'sys_profiles',

modules/boonex/persons/classes/BxPersonsSearchResult.php

@@ -17,6 +17,7 @@ class BxPersonsSearchResult extends BxBaseModProfileSearchResult
 
         $this->aCurrent =  array(
             'name' => 'bx_persons',
+            'module_name' => 'bx_persons',
             'object_metatags' => 'bx_persons',
             'title' => _t('_bx_persons_page_title_browse'),
             'table' => 'sys_profiles',

modules/boonex/posts/classes/BxPostsSearchResult.php

@@ -17,6 +17,7 @@ class BxPostsSearchResult extends BxBaseModTextSearchResult
 
         $this->aCurrent = array(
             'name' => 'bx_posts',
+            'module_name' => 'bx_posts',
             'object_metatags' => 'bx_posts',
             'title' => _t('_bx_posts_page_title_browse'),
             'table' => 'bx_posts_posts',

modules/boonex/timeline/classes/BxTimelineSearchResult.php

@@ -17,6 +17,7 @@ class BxTimelineSearchResult extends BxBaseModNotificationsSearchResult
 
         $this->aCurrent = array(
             'name' => 'bx_timeline',
+            'module_name' => 'bx_timeline',
             'title' => _t('_bx_timeline_page_title_browse'),
             'table' => 'bx_timeline_events',
             'ownFields' => array('id', 'owner_id', 'type', 'action', 'object_id', 'object_privacy_view', 'content', 'title', 'description', 'rate', 'votes', 'comments', 'shares', 'date', 'active', 'hidden'),

searchKeywordContent.php

@@ -14,6 +14,8 @@ bx_import('BxDolLanguages');
 
 $o = new BxDolSearch(bx_get('section'));
 $o->setLiveSearch(bx_get('live_search') ? 1 : 0);
+$o->setMetaType(bx_process_input(bx_get('type')));
+
 $s = $o->response();
 if (!$s)
     $s = $o->getEmptyResult();

template/scripts/BxBaseSearchResult.php

@@ -244,6 +244,7 @@ class BxBaseSearchResult extends BxDolSearchResult
     {
         if ($bAddPaginateParams) { // add pages params
             $sUrl = bx_append_url_params($sUrl, array (
+                'type' => $this->_sMetaType,
                 'start' => $bReplacePagesParams ? (int)$this->aCurrent['paginate']['start'] : '{start}',
                 'per_page' => $bReplacePagesParams ? (int)$this->aCurrent['paginate']['perPage'] : '{per_page}',
             ));