Merge pull request #2172 from tobiasd/20151212-frosticons

[friendica.git] / mod / p.php

diff --git a/mod/p.php b/mod/p.php
index 6bae9925656538552c17dc50546f36213be779f4..5c4b619840480bc05a350926a6e09ba9445a346d 100644 (file)
--- a/mod/p.php
+++ b/mod/p.php
@@ -19,7 +19,7 @@ function p_init($a){
 
        $guid = strtolower(substr($guid, 0, -4));
 
-       $item = q("SELECT `body`, `guid`, `contact-id`, `private`, `created`, `app` FROM `item` WHERE `uid` = 0 AND `guid` = '%s' AND `network` IN ('%s', '%s') LIMIT 1",
+       $item = q("SELECT `title`, `body`, `guid`, `contact-id`, `private`, `created`, `app` FROM `item` WHERE `uid` = 0 AND `guid` = '%s' AND `network` IN ('%s', '%s') LIMIT 1",
                dbesc($guid), NETWORK_DFRN, NETWORK_DIASPORA);
        if (!$item) {
                header($_SERVER["SERVER_PROTOCOL"].' 404 '.t('Not Found'));
@@ -39,8 +39,14 @@ function p_init($a){
                $post["public"] = (!$item[0]["private"] ? 'true':'false');
                $post["created_at"] = datetime_convert('UTC','UTC',$item[0]["created"]);
        } else {
+
+               $body = bb2diaspora($item[0]["body"]);
+
+               if(strlen($item[0]["title"]))
+                       $body = "## ".html_entity_decode($item[0]["title"])."\n\n".$body;
+
                $nodename = "status_message";
-               $post["raw_message"] = str_replace("&", "&", bb2diaspora($item[0]["body"]));
+               $post["raw_message"] = str_replace("&", "&", $body);
                $post["guid"] = $item[0]["guid"];
                $post["diaspora_handle"] = diaspora_handle_from_contact($item[0]["contact-id"]);
                $post["public"] = (!$item[0]["private"] ? 'true':'false');