Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static

diff --combined mod/notifications.php
index 4c564533505c9c933a1da4f6e495a50853e846db,78b26b5d69930182082cab854f783c6d2b0327e0..ed15f14177a45d4b2b1d94f530eeb7eb6f87e4ef
--- 1/mod/notifications.php
--- 2/mod/notifications.php
+++ b/mod/notifications.php
@@@ -11,7 -11,7 +11,7 @@@ require_once("include/network.php")
  
  function notifications_post(&$a) {
  
 -      if(! local_user()) {
 +      if (! local_user()) {
                goaway(z_root());
        }
  
@@@ -67,7 -67,7 +67,7 @@@
  
  function notifications_content(&$a) {
  
 -      if(! local_user()) {
 +      if (! local_user()) {
                notice( t('Permission denied.') . EOL);
                return;
        }
@@@ -285,8 -285,10 +285,10 @@@
                                '$item_label' => $it['label'],
                                '$item_link' => $it['link'],
                                '$item_image' => $it['image'],
+                               '$item_url' => $it['url'],
                                '$item_text' => htmlentities($it['text']),
                                '$item_when' => $it['when'],
+                               '$item_ago' => $it['ago'],
                                '$item_seen' => $it['seen'],
                        ));
                }