diff options
| author | Friendika <info@friendika.com> | 2011-02-14 20:21:28 -0800 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-02-14 20:21:28 -0800 |
| commit | 1dea6a2d711ddf39a5239dc86a1e3c4b7a650064 (patch) | |
| tree | 01c76d3ca98c26856ec9131484262222ba4cd8a3 | |
| parent | 7b265005107f12fa1e5768853e280a8f0b68eeac (diff) | |
| download | volse-hubzilla-1dea6a2d711ddf39a5239dc86a1e3c4b7a650064.tar.gz volse-hubzilla-1dea6a2d711ddf39a5239dc86a1e3c4b7a650064.tar.bz2 volse-hubzilla-1dea6a2d711ddf39a5239dc86a1e3c4b7a650064.zip | |
wrong return url for ajax comments on display and photos pages
| -rw-r--r-- | boot.php | 4 | ||||
| -rw-r--r-- | images/smiley-brokenheart.gif | bin | 0 -> 616 bytes | |||
| -rw-r--r-- | mod/display.php | 2 | ||||
| -rw-r--r-- | mod/photos.php | 2 |
4 files changed, 5 insertions, 3 deletions
@@ -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 Binary files differnew file mode 100644 index 000000000..79ca0c31b --- /dev/null +++ b/images/smiley-brokenheart.gif 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'], |
