some zero theming on settings page

[friendica.git] / include / enotify.php

diff --git a/include/enotify.php b/include/enotify.php
old mode 100755 (executable)
new mode 100644 (file)
index 8385bde..f7ef74f
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -13,7 +13,7 @@ function notification($params) {
 
        $banner = t('Friendica Notification');
        $product = FRIENDICA_PLATFORM;
-       $siteurl = z_path();
+       $siteurl = $a->get_baseurl(true);
        $thanks = t('Thank You,');
        $sitename = get_config('config','sitename');
        $site_admin = sprintf( t('%s Administrator'), $sitename);
@@ -402,8 +402,8 @@ class enotify {
         */
        static public function send($params) {
 
-               $fromName = email_header_encode($params['fromName'],'UTF-8'); 
-               $messageSubject = email_header_encode($params['messageSubject'],'UTF-8');
+               $fromName = email_header_encode(html_entity_decode($params['fromName'],ENT_QUOTES,'UTF-8'),'UTF-8'); 
+               $messageSubject = email_header_encode(html_entity_decode($params['messageSubject'],ENT_QUOTES,'UTF-8'),'UTF-8');
                
                // generate a mime boundary
                $mimeBoundary   =rand(0,9)."-"