wrong return url for ajax comments on display and photos pages

[friendica.git] / mod / network.php

diff --git a/mod/network.php b/mod/network.php
index 02e458d8fb5ef0c83402fd4a5b0a6f30d1d04d29..f09b302e9bbdece1fbc10807856a38aafdcfed0d 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -38,11 +38,11 @@ function network_content(&$a, $update = 0) {
 
        $group = 0;
 
+       $nouveau = false;
+
        if(! $update) {
                $o .= '<script> $(document).ready(function() { $(\'#nav-network-link\').addClass(\'nav-selected\'); });</script>';
 
-               $nouveau = false;
-
                if(($a->argc > 2) && $a->argv[2] === 'new')
                        $nouveau = true;
 
@@ -79,11 +79,21 @@ function network_content(&$a, $update = 0) {
 
                $celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false);
 
+               $jotplugins = '';
+               $jotnets = '';
+               call_hooks('jot_tool', $jotplugins);
+               call_hooks('jot_networks', $jotnets);
+
+               $tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins));        
+
                $o .= replace_macros($tpl,array(
                        '$return_path' => $a->cmd,
                        '$baseurl' => $a->get_baseurl(),
                        '$defloc' => $a->user['default-location'],
                        '$visitor' => 'block',
+                       '$emailcc' => t('CC: email addresses'),
+                       '$jotnets' => $jotnets,
+                       '$emtitle' => t('Example: bob@example.com, mary@example.com'),
                        '$lockstate' => $lockstate,
                        '$acl' => populate_acl((($group) ? $group_acl : $a->user), $celeb),
                        '$bang' => (($group) ? '!' : ''),
@@ -330,7 +340,7 @@ function network_content(&$a, $update = 0) {
 
                        if($item['last-child']) {
                                $comment = replace_macros($cmnt_tpl,array(
-                                       '$return_path' => $_SESSION['return_url'],
+                                       '$return_path' => '', // $_SESSION['return_url'],
                                        '$type' => 'net-comment',
                                        '$id' => $item['item_id'],
                                        '$parent' => $item['parent'],