mirror of
https://github.com/Oreolek/ifhub.club.git
synced 2024-07-08 01:14:24 +03:00
Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
40bfd2b352
|
@ -20,9 +20,9 @@
|
|||
*
|
||||
*/
|
||||
class ActionSearch extends Action {
|
||||
private $sTypesEnabled = array('topics' => array('topic_publish' => 1), 'comments' => array('comment_delete' => 0));
|
||||
private $aSphinxRes = null;
|
||||
private $bIsResults = FALSE;
|
||||
protected $sTypesEnabled = array('topics' => array('topic_publish' => 1), 'comments' => array('comment_delete' => 0));
|
||||
protected $aSphinxRes = null;
|
||||
protected $bIsResults = FALSE;
|
||||
|
||||
public function Init() {
|
||||
$this->SetDefaultEvent('index');
|
||||
|
@ -172,7 +172,7 @@ class ActionSearch extends Action {
|
|||
* @param unknown_type $iLimit
|
||||
* @return unknown
|
||||
*/
|
||||
private function PrepareResults($aReq, $iLimit){
|
||||
protected function PrepareResults($aReq, $iLimit){
|
||||
/**
|
||||
* Количество результатов по типам
|
||||
*/
|
||||
|
|
|
@ -6,7 +6,7 @@ require_once(Config::Get('path.root.engine').'/lib/external/Sphinx/sphinxapi.php
|
|||
*
|
||||
*/
|
||||
class ModuleSphinx extends Module {
|
||||
private $oSphinx = null;
|
||||
protected $oSphinx = null;
|
||||
|
||||
/**
|
||||
* Инициализация
|
||||
|
|
|
@ -122,7 +122,7 @@ class PluginPage_ModulePage_MapperPage extends Mapper {
|
|||
if ($aRows=$this->oDb->select($sql,
|
||||
isset($aFilter['active']) ? $aFilter['active']:DBSIMPLE_SKIP,
|
||||
isset($aFilter['main']) ? $aFilter['main']:DBSIMPLE_SKIP,
|
||||
(array_key_exists('pid',$aFilter) and !is_null($aFilter['pid'])) ? $sPid : DBSIMPLE_SKIP
|
||||
(array_key_exists('pid',$aFilter) and !is_null($aFilter['pid'])) ? $aFilter['pid'] : DBSIMPLE_SKIP
|
||||
)) {
|
||||
return $aRows;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue