From 1dea6a2d711ddf39a5239dc86a1e3c4b7a650064 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 14 Feb 2011 20:21:28 -0800
Subject: [PATCH] wrong return url for ajax comments on display and photos
pages
---
boot.php | 4 +++-
images/smiley-brokenheart.gif | Bin 0 -> 616 bytes
mod/display.php | 2 +-
mod/photos.php | 2 +-
4 files changed, 5 insertions(+), 3 deletions(-)
create mode 100644 images/smiley-brokenheart.gif
diff --git a/boot.php b/boot.php
index 6a1d3a04b..5dc751879 100644
--- a/boot.php
+++ b/boot.php
@@ -1978,9 +1978,11 @@ function smilies($s) {
$a = get_app();
return str_replace(
- array( '<3', ':-)', ';-)', ':-(', ':(', ':-P', ':-"', ':-x', ':-X', ':-D', '8-|', '8-O'),
+ array( '<3', '</3', '<\\3', ':-)', ';-)', ':-(', ':(', ':-P', ':-"', ':-x', ':-X', ':-D', '8-|', '8-O'),
array(
'<img src="' . $a->get_baseurl() . '/images/smiley-heart.gif" alt="<3" />',
+ '<img src="' . $a->get_baseurl() . '/images/smiley-brokenheart.gif" alt="</3" />',
+ '<img src="' . $a->get_baseurl() . '/images/smiley-brokenheart.gif" alt="<\\3" />',
'<img src="' . $a->get_baseurl() . '/images/smiley-smile.gif" alt=":-)" />',
'<img src="' . $a->get_baseurl() . '/images/smiley-wink.gif" alt=";-)" />',
'<img src="' . $a->get_baseurl() . '/images/smiley-frown.gif" alt=":-(" />',
diff --git a/images/smiley-brokenheart.gif b/images/smiley-brokenheart.gif
new file mode 100644
index 0000000000000000000000000000000000000000..79ca0c31b46ad5fad3780cb4e009f7b427907179
GIT binary patch
literal 616
zcmZ?wbhEHb6k-r!IOf2>#>6DTz@WguAjZXO#lq^r#Kb8g9L>Ox!@wXZAyv-6*v!B%
zlYuFZPhc?v!$t<ywTztV>T2m?($YHG*2<du8CZ@nuv}ndHP<zG#mM!Efkn^K;yV-n
ze@31^%>4gBNFd7E#@frv)yKy%B*Zs3I4(N6proX=s3fzhs;sH0ed5GPQ>XMzpEhCE
ztf}+n&0Mr_+KS~1HmqN_W%JHWn>Ov+yKV2@o%{CgK79Dt<x3~7U%Pt!`pug+A3lEc
z=*i<JA3yvb;z02y3nLeUHG>WV5P;%@f&FNMb(5a5h=i7{wZ3YbmQ7QW5i6gR7?+^x
z<f*L66YPa#7338ZM0sQuDacN+HW8PV+bFk0ej~T^8bztCn>I1ZO;B&r5Z|*&fL&>V
zEUTrp0h8<oIdNt-wx;b09EMHGEUV;LChV8H#B0@LC(NV3t<rRI<GURb%orq_uCaX<
zU@%@&wne~Y!S!|?#xRzaFYClRQn<?*1P&zL(&4zF^iE)*f=ox2xe1q7f@3H<lco#T
cDo2GY)>9{h$W#bC6!dXaV|dUZ!NFh+02paY-v9sr
literal 0
HcmV?d00001
diff --git a/mod/display.php b/mod/display.php
index 3215ae90a..b07e1aee5 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -153,7 +153,7 @@ function display_content(&$a) {
}
if($item['last-child']) {
$comment = replace_macros($cmnt_tpl,array(
- '$return_path' => $_SESSION['return_url'],
+ '$return_path' => '', // $_SESSION['return_url'],
'$type' => 'wall-comment',
'$id' => $item['item_id'],
'$parent' => $item['parent'],
diff --git a/mod/photos.php b/mod/photos.php
index 9acde458d..a44eb5a5f 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -1048,7 +1048,7 @@ function photos_content(&$a) {
if($can_post || can_write_wall($a,$owner_uid)) {
if($link_item['last-child']) {
$o .= replace_macros($cmnt_tpl,array(
- '$return_path' => $return_url,
+ '$return_path' => '', // $return_url,
'$type' => 'wall-comment',
'$id' => $link_item['id'],
'$parent' => $link_item['id'],