Merge pull request #932 from annando/master

[friendica.git] / mod / notify.php

diff --git a/mod/notify.php b/mod/notify.php
index 3abc1185cffc06eb3b44d2970b8f6de6595c30cd..256bb77932bfb9ea304de9a3be94b2998281b2cb 100644 (file)
--- a/mod/notify.php
+++ b/mod/notify.php
@@ -40,14 +40,14 @@ function notify_content(&$a) {
                return login();
 
                $notif_tpl = get_markup_template('notifications.tpl');
-               
+
                $not_tpl = get_markup_template('notify.tpl');
                require_once('include/bbcode.php');
 
                $r = q("SELECT * from notify where uid = %d and seen = 0 order by date desc",
                        intval(local_user())
                );
-               
+
                if (count($r) > 0) {
                        foreach ($r as $it) {
                                $notif_content .= replace_macros($not_tpl,array(
@@ -60,15 +60,10 @@ function notify_content(&$a) {
                } else {
                        $notif_content .= t('No more system notifications.');
                }
-               
-               $includes = array(
-                       '$common_tabs' => 'common_tabs.tpl',
-               );
-               $includes = set_template_includes($a->theme['template_engine'], $includes);
 
-               $o .= replace_macros($notif_tpl,$includes + array(
+               $o .= replace_macros($notif_tpl, array(
                        '$notif_header' => t('System Notifications'),
-                       '$tabs_data' => '', // $tabs,
+                       '$tabs' => '', // $tabs,
                        '$notif_content' => $notif_content,
                ));