From c939232feeef6133c82473e9ed8201551ba11db9 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 8 May 2012 09:43:22 +0000
Subject: [PATCH] * InfoLog: fixed subs view to display only selected
 custom-fields of parent

---
 infolog/inc/class.infolog_ui.inc.php | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/infolog/inc/class.infolog_ui.inc.php b/infolog/inc/class.infolog_ui.inc.php
index 3520be7ebe..f732622843 100644
--- a/infolog/inc/class.infolog_ui.inc.php
+++ b/infolog/inc/class.infolog_ui.inc.php
@@ -378,7 +378,7 @@ class infolog_ui
 		{
 			$query['action_id'] = array_shift($query['action_id']);	// display single parent as app_header
 		}
-		
+
 		// Check to see if we need to remove description
 		$et = new ReflectionClass('etemplate');
 		$remove = !($et->isSubclassOf(new ReflectionClass('etemplate_widget')));
@@ -403,6 +403,22 @@ class infolog_ui
 			{
 				$main = $this->get_info($main, $readonlys);
 				$main['class'] .= 'th ';
+				// if only certain custom-fields are to be displayed, we need to unset the not displayed ones manually
+				// as read() always read them all, while search() only reads the selected ones
+				if ($query['custom_fields'])
+				{
+					foreach($columselection as $col)
+					{
+						if ($col[0] == '#')
+						{
+							foreach($main as $n => $v)
+							{
+								if ($n[0] == '#' && !in_array($n, $columselection)) unset($main[$n]);
+							}
+							break;
+						}
+					}
+				}
 				array_splice($rows, $id, 0, array($main));
 				unset($parents[$parent_index]);
 			}