From bdc8b5bd01d2142767fc7583dcac0ffc223adda3 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 27 Aug 2014 07:53:40 +0000
Subject: [PATCH] * InfoLog: subentries are now shown only in hierarchical view
 and updates to them also update modification time of parent

---
 infolog/inc/class.infolog_so.inc.php | 4 ++--
 infolog/inc/class.infolog_ui.inc.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/infolog/inc/class.infolog_so.inc.php b/infolog/inc/class.infolog_so.inc.php
index de0ff4bfc8..7fcc1a1274 100644
--- a/infolog/inc/class.infolog_so.inc.php
+++ b/infolog/inc/class.infolog_so.inc.php
@@ -686,7 +686,7 @@ class infolog_so
 			'event'       => 'calendar'
 		);
 		// query children independent of action
-		if (empty($query['col_filter']['info_id_parent']))
+		if ((string)$query['col_filter']['info_id_parent'] === '')
 		{
 			$action = isset($action2app[$query['action']]) ? $action2app[$query['action']] : $query['action'];
 			if ($action)
@@ -748,7 +748,7 @@ class infolog_so
 					continue;
 				}
 				if ($col[0] != '#' && substr($col,0,5) != 'info_' && isset($table_def['fd']['info_'.$col])) $col = 'info_'.$col;
-				if (!empty($data) && preg_match('/^[a-z_0-9]+$/i',$col))
+				if ((string)$data !== '' && preg_match('/^[a-z_0-9]+$/i',$col))
 				{
 					switch ($col)
 					{
diff --git a/infolog/inc/class.infolog_ui.inc.php b/infolog/inc/class.infolog_ui.inc.php
index dc817500fa..1ee93e91ea 100644
--- a/infolog/inc/class.infolog_ui.inc.php
+++ b/infolog/inc/class.infolog_ui.inc.php
@@ -281,7 +281,7 @@ class infolog_ui
 		if (!$query['csv_export'])
 		{
 			unset($query['no_actions']);
-			$parent_id = $query['col_filter']['parent_id'];
+			$parent_id = (int)$query['col_filter']['parent_id'];
 			unset($query['col_filter']['parent_id']);
 			if(!$query['action'])
 			{
@@ -295,7 +295,7 @@ class infolog_ui
 			$query['action_var'] = 'multi_action';	// as 'action' is already used in infolog
 		}
 		$orginal_colfilter = $query['col_filter'];
-		if (isset($parent_id)) $query['col_filter']['info_id_parent'] = (int)$parent_id;
+		if (isset($parent_id)) $query['col_filter']['info_id_parent'] = (string)$parent_id;
 
 		//echo "<p>infolog_ui.get_rows(start=$query[start],search='$query[search]',filter='$query[filter]',cat_id=$query[cat_id],action='$query[action]/$query[action_id]',col_filter=".print_r($query['col_filter'],True).",sort=$query[sort],order=$query[order])</p>\n";
 		if (!isset($query['start'])) $query['start'] = 0;