Fixed encoding

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@2102 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/html/helpviewer.php b/html/helpviewer.php
index f307564c3ff83cbcc8b61da77af286df522a0762..44377afbdea51ee786198e8a596823df7902cff3 100644 (file)
--- a/html/helpviewer.php
+++ b/html/helpviewer.php
@@ -186,7 +186,7 @@ if(isset($_POST['search'])){
   $header= "<!-- headers.tpl-->".$smarty->fetch(get_template_path('headers.tpl'));
 
   /* I don't know why, but we must use utf8_encode to avoid dispplay errors */
-  $display= utf8_encode(  $header.$smarty->fetch(get_template_path('help.tpl')));
+  $display= (  $header.$smarty->fetch(get_template_path('help.tpl')));
   echo $display;
 }elseif(((empty($helpdir)))||($helpdir=="/")){
   /* Generate Index and display it */

diff --git a/include/functions_helpviewer.inc b/include/functions_helpviewer.inc
index 6de1627ca18661aad3271262bf7aa97b815cc163..579ede3316eb7659ae8a5be9a3890d60817dfc46 100644 (file)
--- a/include/functions_helpviewer.inc
+++ b/include/functions_helpviewer.inc
@@ -86,7 +86,7 @@ function genIndex($arr)
       $str .= "<p style='padding-left:20px;'><b>"._($name)."</b> ("._("No help available for this plugin.").")</p>";
     }
   }
-  return utf8_decode($str);
+  return (utf8_decode($str));
 }
 
 
@@ -452,14 +452,14 @@ function createResultEntry($entry,$res,$name,$max)
           <table summary=\"\"  width=\"98%\" align=\"center\">
             <tr>
               <td height=15>
-                <b>".$entry['headline']."</b> -".htmlentities(substr(strip_tags($entry['content']),0,120))."...
+                <b>".utf8_encode($entry['headline'])."</b> -".utf8_encode(substr(strip_tags($entry['content']),0,120))."...
               </td>
               <td width=50 valign=\"top\">".progressbar($percentage,50,8)."</td>
              </tr>
              <tr>
               <td colspan=2>
                 <b>
-                  ".htmlentities(sprintf(_("%s%% hit rate in file %s"),$percentage,$name))."
+                  ".(sprintf(_("%s%% hit rate in file %s"),$percentage,$name))."
                 </b>
               </td>
             </tr>