problem with undefined attribute fixed

[contagged] / template.php

diff --git a/template.php b/template.php
index dbe4b5ec5fa0e66d72be17804137dde849e8b2c7..06fe3d0cebdeacbc4482d4e47cfda46c5dfeb3e4 100644 (file)
--- a/template.php
+++ b/template.php
@@ -57,15 +57,13 @@ function tpl_entry($in){
   if ($conf[extended]){
     //handle marker special in extended mode
     $out['marker'] = $in['marker'];
+    if(is_array($in['marker'])) $out['markers'] = join(', ',$in['marker']);
   }
   if ($conf[openxchange]){
     //handle categories special in openxchange mode
     $out['categories'] = $in['OXUserCategories'];
   }
 
-  //decode array
-  utf8_decode_array($out);
-
 /*print '<pre>';
 print_r($out);
 print '</pre>';*/
@@ -126,7 +124,6 @@ function tpl_markers(){
   $markers = array_unique($markers);
   sort($markers,SORT_STRING);
  
-  utf8_decode_array($markers);
   $smarty->assign('markers',$markers);
 }
 
@@ -160,7 +157,6 @@ function tpl_orgs(){
   }
   $orgs = array_unique($orgs);
   sort($orgs,SORT_STRING);
-  utf8_decode_array($orgs);
   $smarty->assign('orgs',$orgs);
 }
 
@@ -199,7 +195,6 @@ function tpl_categories(){
   $categories = array_unique($categories);
   sort($categories,SORT_STRING);
  
-  utf8_decode_array($categories);
   $smarty->assign('categories',$categories);
 }
 
@@ -238,7 +233,6 @@ function tpl_timezone(){
   $timezone = array_unique($timezone);
   sort($timezone,SORT_STRING);
  
-  utf8_decode_array($timezone);
   $smarty->assign('timezone',$timezone);
 }
 
@@ -277,7 +271,6 @@ function tpl_country(){
   $country = array_unique($country);
   sort($country,SORT_STRING);
  
-  utf8_decode_array($country);
   $smarty->assign('country',$country);
 }