silence parse_url on hostile input, need to get_app() for proc_run php location

[friendica.git] / mod / display.php

diff --git a/mod/display.php b/mod/display.php
index 3215ae90a04958352fac8b7eb3e74298e731e7fa..7cefc42e6ceaf90eca21960321b39fa98a94cae5 100644 (file)
--- a/mod/display.php
+++ b/mod/display.php
@@ -153,7 +153,8 @@ function display_content(&$a) {
                                }
                                if($item['last-child']) {
                                        $comment = replace_macros($cmnt_tpl,array(
-                                               '$return_path' => $_SESSION['return_url'],
+                                               '$return_path' => '', 
+                                               '$jsreload' => $_SESSION['return_url'],
                                                '$type' => 'wall-comment',
                                                '$id' => $item['item_id'],
                                                '$parent' => $item['parent'],
@@ -233,7 +234,7 @@ function display_content(&$a) {
                        }
 
                        if(($item['contact-id'] == remote_user()) || ($item['uid'] == local_user()))
-                               $drop = replace_macros(load_view_file('view/wall_item_drop.tpl'), array('$id' => $item['id']));
+                               $drop = replace_macros(load_view_file('view/wall_item_drop.tpl'), array('$id' => $item['id'], '$delete' => t('Delete')));
                        else 
                                $drop = replace_macros(load_view_file('view/wall_fake_drop.tpl'), array('$id' => $item['id']));
 
@@ -257,7 +258,11 @@ function display_content(&$a) {
 
                        $tmp_item = replace_macros($template,array(
                                '$id' => $item['item_id'],
-                               '$title' => t('View $name\'s profile'),
+                               '$linktitle' => t('View $name\'s profile'),
+                               '$olinktitle' => t('View $owner_name\'s profile'),
+                               '$to' => t('to'),
+                               '$wall' => t('Wall-to-Wall'),
+                               '$vwall' => t('via Wall-To-Wall:'),
                                '$profile_url' => $profile_link,
                                '$name' => $profile_name,
                                '$sparkle' => $sparkle,
@@ -272,6 +277,7 @@ function display_content(&$a) {
                                '$owner_url' => $owner_url,
                                '$owner_photo' => $owner_photo,
                                '$owner_name' => $owner_name,
+                               '$plink' => get_plink($item),
                                '$drop' => $drop,
                                '$vote' => $likebuttons,
                                '$like' => $like,