ifhub/ifhub.club
1
0
Fork 0
mirror of https://github.com/Oreolek/ifhub.club.git synced 2024-07-05 07:54:24 +03:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Mzhelskiy Maxim 2011-11-29 08:11:14 +04:00
parent ab476ea71d 9ba18b8e73
commit 40bfd2b352
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
classes/actions/ActionSearch.class.php
View file

@ -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){
/**
* Количество результатов по типам
*/

2
classes/modules/sphinx/Sphinx.class.php
View file

@ -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;
/**
* Инициализация

2
plugins/page/classes/modules/page/mapper/Page.mapper.class.php
View file

@ -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;
}