Merge pull request #2190 from annando/1512-getload

[friendica.git] / mod / notify.php

diff --git a/mod/notify.php b/mod/notify.php
index 3abc1185cffc06eb3b44d2970b8f6de6595c30cd..02260514af91493b287a06438fd799e016c224e5 100644 (file)
--- a/mod/notify.php
+++ b/mod/notify.php
@@ -17,6 +17,17 @@ function notify_init(&$a) {
                                dbesc($r[0]['otype']),
                                intval(local_user())
                        );
+
+                       // The friendica client has problems with the GUID. this is some workaround
+                       if ($a->is_friendica_app()) {
+                               require_once("include/items.php");
+                               $urldata = parse_url($r[0]['link']);
+                               $guid = basename($urldata["path"]);
+                               $itemdata = get_item_id($guid, local_user());
+                               if ($itemdata["id"] != 0)
+                                       $r[0]['link'] = $a->get_baseurl().'/display/'.$itemdata["nick"].'/'.$itemdata["id"];
+                       }
+
                        goaway($r[0]['link']);
                }
 
@@ -40,14 +51,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 +71,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,
                ));