Version 3.4.8

upload/admin/applications/members/extensions/search/engines/sql.php

@@ -2,18 +2,18 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.6
+ * IP.Board v3.4.8
  * Basic Forum Search
- * Last Updated: $Date: 2013-02-25 18:03:27 -0500 (Mon, 25 Feb 2013) $
+ * Last Updated: $Date: 2014-11-11 15:53:26 -0500 (Tue, 11 Nov 2014) $
  * </pre>
  *
- * @author 		$Author: AndyMillne $
+ * @author 		$Author: rashbrook $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
  * @license		http://www.invisionpower.com/company/standards.php#license
  * @package		IP.Board
  * @subpackage	Forums
  * @link		http://www.invisionpower.com
- * @version		$Rev: 12024 $
+ * @version		$Rev: 12568 $
  */
 
 if ( ! defined( 'IN_IPB' ) )
@@ -225,13 +225,27 @@ class search_engine_members extends search_engine
 			break;
 		}
 		
+		$joins = array();
+		$joins[] = array(
+			'from'	=> array( 'profile_portal' => 'p' ),
+			'where'	=> "p.pp_member_id=m.member_id",
+			'type'	=> 'left',
+		);
+		
+		if ( ! $this->memberData['g_access_cp'] )
+		{
+			$joins[] = array(
+				'from'	=> array( 'groups' => 'g' ),
+				'where'	=> "g.g_id = m.member_group_id",
+				'type'	=> 'left',
+			);
+		}
+		
 		/* Query the count */	
 		$count = $this->DB->buildAndFetch( array('select'   => 'COUNT(*) as total_results',
 												 'from'	    => array( 'members' => 'm' ),
 				 								 'where'	=> $this->_buildWhereStatement( $search_term ),
-												 'add_join' => array( array( 'from'   => array( 'profile_portal' => 'p' ),
-																			'where'  => "p.pp_member_id=m.member_id",
-																			'type'   => 'left' ) ) ) );
+												 'add_join' => $joins ) );
 		
 		
 		
@@ -241,10 +255,7 @@ class search_engine_members extends search_engine
 								'where'	   => $this->_buildWhereStatement( $search_term ),
 								'order'    => $sortKey . ' ' . $sort_order,
 								'limit'    => array( IPSSearchRegistry::get('in.start'), IPSSearchRegistry::get('opt.search_per_page') ),
-								'add_join' => array( array( 'select' => 'p.*',
-															'from'   => array( 'profile_portal' => 'p' ),
-															'where'  => "p.pp_member_id=m.member_id",
-															'type'   => 'left' ) ) ) );
+								'add_join' => $joins ) );
 		$this->DB->execute();
 
 		/* Get results */
@@ -487,6 +498,11 @@ class search_engine_members extends search_engine
 				$where_clause[] = "m.joined < {$this->search_end_timestamp}";
 			}
 		}
+		
+		if ( ! $this->memberData['g_access_cp'] )
+		{
+			$where_clause[] = "g.g_hide_from_list = 0";
+		}
 			
 		/* Build and return the string */
 		return implode( " AND ", $where_clause );