Adding preview value to "prepare_body" hook. (Will be used in addons for network...

diff --git a/include/conversation.php b/include/conversation.php
index ddb01ec9b8a3e3a63e88bc71db9960bfaaac0fc2..95792640e3b64484738c73401d40c27dc68a1397 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -620,7 +620,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
                                $likebuttons = false;
                                $shareable = false;
 
-                               $body = prepare_body($item,true);
+                               $body = prepare_body($item,true, $preview);
 
 
                                list($categories, $folders) = get_cats_and_terms($item);
@@ -685,7 +685,8 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
                                        'like' => '',
                                        'dislike' => '',
                                        'comment' => '',
-                                       'conv' => (($preview) ? '' : array('href'=> $a->get_baseurl($ssl_state) . '/display/' . $nickname . '/' . $item['id'], 'title'=> t('View in context'))),
+                                       //'conv' => (($preview) ? '' : array('href'=> $a->get_baseurl($ssl_state) . '/display/' . $nickname . '/' . $item['id'], 'title'=> t('View in context'))),
+                                       'conv' => (($preview) ? '' : array('href'=> $a->get_baseurl($ssl_state) . '/display/'.$item['guid'], 'title'=> t('View in context'))),
                                        'previewing' => $previewing,
                                        'wait' => t('Please wait'),
                                        'thread_level' => 1,

diff --git a/include/text.php b/include/text.php
index 2490bf402b5a28869812e3f31a14dcef2ef69063..4d6aa8697ae650e57499d8dc5f24b6523084dc30 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -1293,7 +1293,7 @@ if(! function_exists('prepare_body')) {
  * @hook prepare_body ('item'=>item array, 'html'=>body string) after first bbcode to html
  * @hook prepare_body_final ('item'=>item array, 'html'=>body string) after attach icons and blockquote special case handling (spoiler, author)
  */
-function prepare_body(&$item,$attach = false) {
+function prepare_body(&$item,$attach = false, $preview = false) {
 
        $a = get_app();
        call_hooks('prepare_body_init', $item);
@@ -1353,7 +1353,7 @@ function prepare_body(&$item,$attach = false) {
        }
 
 
-       $prep_arr = array('item' => $item, 'html' => $s);
+       $prep_arr = array('item' => $item, 'html' => $s, 'preview' => $preview);
        call_hooks('prepare_body', $prep_arr);
        $s = $prep_arr['html'];