From 83fc4754c44aaf0803f1997a48c9ba444a08dd4c Mon Sep 17 00:00:00 2001
From: abacab <wagnerch@glycerine.alpha>
Date: Sun, 28 Dec 2008 20:30:35 -0500
Subject: [PATCH] Call-by-reference warnings, changed sql_select to sqlSelect.

---
 modules/faq/faq.inc.php | 37 ++++++++++++++++---------------------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/modules/faq/faq.inc.php b/modules/faq/faq.inc.php
index abe222f1..728966d7 100644
--- a/modules/faq/faq.inc.php
+++ b/modules/faq/faq.inc.php
@@ -55,14 +55,13 @@ class faq
 	{
 		$db = &DB(); 
 		if(!empty($VAR['faq_autofill']) && strlen($VAR['faq_autofill']) > 3)  { 
-			$dbm = new CORE_database();
 			$result = $db->Execute(
-				$sql = $dbm->sql_select(
+				$sql = sqlSelect(
+					$db,
 					Array( 'faq_translate', 'faq' ),		 
 					Array( 'A.*', 'B.name' ),			 
 					" A.faq_id = B.id AND MATCH(A.question, A.answer) AGAINST(".$db->qstr($VAR['faq_autofill'].'*')." IN BOOLEAN MODE)",  
-					"",  
-					&$db
+					""
 				)
 			);  
 		} 
@@ -96,14 +95,13 @@ class faq
 	{
 		if (!empty($VAR['id'])) {
 			$db = &DB();
-			$dbm = new CORE_database();
 			$rs = $db->Execute( 
-				$sql = $dbm->sql_select( 
+				$sql = sqlSelect( 
+					$db,
 					Array( 'faq_translate', 'faq', 'faq_category' ),		 
 					Array( 'A.*', 'B.name', 'C.group_avail' ),			 
 					" B.id = ::".$VAR['id'].":: AND B.id = A.faq_id AND A.language_id = '".SESS_LANGUAGE."' AND B.status = 1 AND C.status = 1 ",  
-					"",  
-					&$db
+					""
 				)
 			); 	        	    	        	    	
 		}
@@ -126,25 +124,23 @@ class faq
 	{
 		$db = &DB(); 
 		if(!empty($VAR['search']) && strlen($VAR['search']) > 3)  { 
-			$dbm = new CORE_database();
 			$result = $db->Execute(
-				$sql = $dbm->sql_select(
+				$sql = sqlSelect(
+					$db,
 					Array( 'faq_translate', 'faq', 'faq_category'  ),		 
 					Array( 'A.*', 'B.name', 'C.group_avail' ),			 
 					"  A.faq_id = B.id AND B.faq_category_id = C.id AND MATCH(A.question, A.answer) AGAINST(".$db->qstr($VAR['search'].'*')." IN BOOLEAN MODE) AND B.status = 1 AND C.status=1",  
-					"",  
-					&$db
+					""
 				)
 			);  
 		} elseif (!empty($VAR['category_id'])) {
-			$dbm = new CORE_database();
 			$result = $db->Execute(  
-				$sql = $dbm->sql_select( 
+				$sql = sqlSelect( 
+					$db,
 					Array( 'faq_translate', 'faq', 'faq_category' ),		 
 					Array( 'A.*', 'B.name', 'C.group_avail' ),			 
 					" B.faq_category_id = ::".$VAR['category_id'].":: AND B.id = A.faq_id AND B.faq_category_id = C.id AND A.language_id = '".SESS_LANGUAGE."' AND B.status = 1 AND C.status=1",  
-					"",  
-					&$db
+					""
 				)
 			);         		
 		} 
@@ -175,14 +171,13 @@ class faq
 	function faq_categories($VAR) 
 	{
 		$db = &DB();
-		$dbm = new CORE_database();
 			$rs = $db->Execute( $sql= 
-				$sql = $dbm->sql_select(
+				$sql = sqlSelect(
+				$db,
 				'faq_category',
 				'*' ,
 				" status=1 ",
-				"sort_order,name,date_orig",
-				&$db
+				"sort_order,name,date_orig"
 			)
 		);
 
@@ -315,4 +310,4 @@ class faq
 		  return $text;
 	}     	
 }
-?>
\ No newline at end of file
+?>