[eGroupWare-svn] r55880 - /branches/14.2/etemplate/inc/class.so_sql.inc.php

[email protected]
Newsgroups gmane.comp.web.egroupware.cvs
Message-ID <[email protected]>
Author: ralfbecker
Date: Wed Apr 27 12:42:13 2016
New Revision: 55880

URL: http://svn.stylite.de/viewvc/egroupware?rev=55880&view=rev
Log:
fix sql error after clear cache, because db class has again type "mysqli" instead of just "mysql"

Modified:
    branches/14.2/etemplate/inc/class.so_sql.inc.php

Modified: branches/14.2/etemplate/inc/class.so_sql.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/branches/14.2/etemplate/inc/class.so_sql.inc.php?rev=55880&r1=55879&r2=55880&view=diff
==============================================================================
--- branches/14.2/etemplate/inc/class.so_sql.inc.php (original)
+++ branches/14.2/etemplate/inc/class.so_sql.inc.php Wed Apr 27 12:42:13 2016
@@ -1135,7 +1135,8 @@
 	public static function fix_group_by_columns($group_by, &$columns, $table_name, $autoinc_id)
 	{
 		$matches = null;
-		if ($GLOBALS['egw']->db->Type == 'mysql' || !preg_match('/(GROUP BY .*)(HAVING.*|ORDER BY.*)?$/iU', $group_by, $matches))
+		//error_log(__METHOD__."('$group_by', ..., '$table_name', '$autoinc_id') db->Type=".array2string($GLOBALS['egw']->db->Type));
+		if (substr($GLOBALS['egw']->db->Type, 0, 5) == 'mysql' || !preg_match('/(GROUP BY .*)(HAVING.*|ORDER BY.*)?$/iU', $group_by, $matches))
 		{
 			return $group_by;	// nothing to do
 		}


------------------------------------------------------------------------------
Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.