Merge pull request #764 from fabrixxm/bug729

[friendica.git] / include / enotify.php

diff --git a/include/enotify.php b/include/enotify.php
index 928d2b4b484c2b818618e6b600b271ec6a4f3d1e..72365a762f983ce7c0a576aa4bf57eb9580d9428 100644 (file)
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -17,7 +17,7 @@ function notification($params) {
        $product = FRIENDICA_PLATFORM;
        $siteurl = $a->get_baseurl(true);
        $thanks = t('Thank You,');
-       $sitename = get_config('config','sitename');
+       $sitename = $a->config['sitename'];
        $site_admin = sprintf( t('%s Administrator'), $sitename);
 
        $sender_name = $product;
@@ -214,11 +214,10 @@ function notification($params) {
        }
 
        if($params['type'] == NOTIFY_CONFIRM) {
-
        }
 
        if($params['type'] == NOTIFY_SYSTEM) {
-               
+
        }
 
        $h = array(
@@ -269,9 +268,15 @@ function notification($params) {
        $datarray['type']  = $params['type'];
        $datarray['verb']  = $params['verb'];
        $datarray['otype'] = $params['otype'];
+       $datarray['abort'] = false;
  
        call_hooks('enotify_store', $datarray);
 
+       if($datarray['abort']) {
+               pop_lang();
+               return;
+       }
+
        // create notification entry in DB
 
        $r = q("insert into notify (hash,name,url,photo,date,uid,link,parent,type,verb,otype)