From 48ba641cb37861c62328e1d93f6709b11442cbf1 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Tue, 13 Jul 2010 14:22:14 +0000
Subject: [PATCH] Avoid conflicts with other objects that have ->db defined by
 using the global db

---
 etemplate/inc/class.so_sql.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etemplate/inc/class.so_sql.inc.php b/etemplate/inc/class.so_sql.inc.php
index 7225ea26f9..471dce91ab 100644
--- a/etemplate/inc/class.so_sql.inc.php
+++ b/etemplate/inc/class.so_sql.inc.php
@@ -1094,7 +1094,7 @@ class so_sql
 		}
 		if($columns)
 		{
-			$columns = call_user_func_array(array($this->db,'concat'),$columns);
+			$columns = call_user_func_array(array($GLOBALS['egw']->db,'concat'),$columns);
 		}
 
 		// Break the search string into tokens