From e87c0dfb1a6c57534be5d042e7cd370b731421f0 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 16 Feb 2015 10:22:23 +0000
Subject: [PATCH] * ProjectManager/PostgreSQL: fix SQL error in project-list
 caused by new resources column fix columns containing commas as part of
 function calls getting split incorrect in fix_group_by_columns

---
 etemplate/inc/class.so_sql.inc.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/etemplate/inc/class.so_sql.inc.php b/etemplate/inc/class.so_sql.inc.php
index e92d792f05..3cf3ea64fe 100644
--- a/etemplate/inc/class.so_sql.inc.php
+++ b/etemplate/inc/class.so_sql.inc.php
@@ -1145,6 +1145,18 @@ class so_sql
 		if (!is_array($columns))
 		{
 			$columns = preg_split('/, */', $columns);
+
+			// fix columns containing commas as part of function calls
+			for($n = 0; $n < count($columns); ++$n)
+			{
+				$col =& $columns[$n];
+				while (substr_count($col, '(') > substr_count($col, ')') && ++$n < count($columns))
+				{
+					$col .= ','.$columns[$n];
+					unset($columns[$n]);
+				}
+			}
+			unset($col);
 		}
 		foreach($columns as $n => $col)
 		{