R31413 - /trunk/etemplate/inc/class.so_sql.inc.php

Author: nathangray
New Revision: 31413

URL: http://www.egroupware.org/viewvc/egroupware?rev=31413&view=rev
Log:
Avoid conflicts with other objects that have ->db defined by using the global db

Modified:
trunk/etemplate/inc/class.so_sql.inc.php

Modified: trunk/etemplate/inc/class.so_sql.inc.php
URL: http://www.egroupware.org/viewvc/egroupware/trunk/etemplate/inc/class.so_sql.inc.php?rev=31413&r1=31412&r2=31413&view=diff

— trunk/etemplate/inc/class.so_sql.inc.php (original)
+++ trunk/etemplate/inc/class.so_sql.inc.php Tue Jul 13 16:22:14 2010
@@ -1094,7 +1094,7 @@
}
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
    

This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first – http://p.sf.net/sfu/sprint-com-first


eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs