Let user decide how to encode xfaces

git-svn-id: svn+ssh://murphy/home/svn/banana/trunk@91 9869982d-c50d-0410-be91-f2a2ec7c7c7b

diff --git a/banana/misc.inc.php b/banana/misc.inc.php
index 269f2d0..d956a0f 100644 (file)
--- a/banana/misc.inc.php
+++ b/banana/misc.inc.php
@@ -64,7 +64,7 @@ function makeLink($params)
 
     if (isset($params['xface'])) {
         $file = dirname($file) . '/xface.php';
-        $get  = 'face=' . urlencode($params['xface']);
+        $get  = 'face=' . urlencode(base64_encode($params['xface']));
     } else if (count($params) != 0) {
         $get = '?';
         foreach ($params as $key=>$value) {
@@ -308,7 +308,7 @@ function formatDisplayHeader($_header,$_text) {
             return $rsl;
 
         case "x-face":
-            return '<img src="' . makeLink(Array('xface' => base64_encode(headerDecode($_text)))) .'"  alt="x-face" />';
+            return '<img src="' . makeLink(Array('xface' => headerDecode($_text))) .'"  alt="x-face" />';
     
         case "subject":
             $link = null;