wrong return url for ajax comments on display and photos pages

diff --git a/boot.php b/boot.php
index 6a1d3a04b41ce2365b9fb15c31ef66bb69c81d60..5dc7518790e25bc14f4bd67f6a24fbc08ddc453d 100644 (file)
--- 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 (file)
index 0000000..79ca0c3
Binary files /dev/null and b/images/smiley-brokenheart.gif differ

diff --git a/mod/display.php b/mod/display.php
index 3215ae90a04958352fac8b7eb3e74298e731e7fa..b07e1aee57949e2e567c2c0aacae27cc0808dc70 100644 (file)
--- 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 9acde458df4df001efcc35fee5d818dd5a2744f7..a44eb5a5f509a6667b274e73cd8923acf236ef14 100644 (file)
--- 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'],