From b6cc2d6d7b75aff1a96b138bc3dec0279bc3a4f9 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 14 Feb 2005 10:39:10 +0000
Subject: [PATCH] fixed bug reported by Reinhard Gustavik on the german list:
 custom status get's not saved and not used

---
 infolog/inc/class.boinfolog.inc.php | 17 +----------------
 infolog/inc/class.uiinfolog.inc.php |  4 +++-
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/infolog/inc/class.boinfolog.inc.php b/infolog/inc/class.boinfolog.inc.php
index 0f270cf014..6729bcf656 100644
--- a/infolog/inc/class.boinfolog.inc.php
+++ b/infolog/inc/class.boinfolog.inc.php
@@ -15,21 +15,6 @@
 
 	class boinfolog 			// BO: buiseness objects: internal logic
 	{
-		var $public_functions = array
-		(
-			'init'           => True,	// in class soinfolog
-			'read'           => True,
-			'write'          => True,
-			'delete'         => True,
-			'check_access'   => True,
-			'anzSubs'        => True,
-			'search'         => True,
-			'get_rows'       => True,
-			'link_title'     => True,
-			'link_query'     => True,
-			'link_id2from'   => True,
-			'cal_to_include' => True
-		);
 		var $enums;
 		var $so;
 		var $vfs;
@@ -123,7 +108,7 @@
 						{
 							$this->status[$key] = array();
 						}
-						$this->status[$key] += $this->config->config_data['status'][$key];
+						$this->status[$key] = array_merge($this->status[$key],$this->config->config_data['status'][$key]);
 					}
 				}
 				if (isset($this->config->config_data['types']) && is_array($this->config->config_data['types']))
diff --git a/infolog/inc/class.uiinfolog.inc.php b/infolog/inc/class.uiinfolog.inc.php
index 054998229d..fc7fda4d59 100644
--- a/infolog/inc/class.uiinfolog.inc.php
+++ b/infolog/inc/class.uiinfolog.inc.php
@@ -431,7 +431,8 @@
 						$content['info_responsible'] = $parent['info_owner'];
 					}
 					*/
-					$content['info_status'] = 'ongoing';
+					$content['info_type'] = $parent['info_type'];
+					$content['info_status'] = $this->bo->status['defaults'][$content['info_type']];
 					$content['info_confirm'] = 'not';
 					$content['info_subject']=lang($this->messages['re']).' '.$parent['info_subject'];
 					$content['info_des'] = '';
@@ -500,6 +501,7 @@
 						{
 							$content['info_type'] = $type;
 						}
+						$content['info_status'] = $this->bo->status['defaults'][$content['info_type']];
 						break;
 				}
 				$content['link_to']['primary'] = (int)$content['info_link_id'];