aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorM. Dent <dentm42@gmail.com>2019-02-21 12:03:56 +0100
committerM. Dent <dentm42@gmail.com>2019-02-21 12:03:56 +0100
commit3d253309b79dd6264a7229c26f07506ddc9a28f6 (patch)
treeb3ed221dfb003b9df9199ca0be7a6538cfff0879
parent7f1e0313a0213de26b9c3cbd063348edd2cd14b8 (diff)
parenta0ad110cff00bc9c506f5e6b921e5bd350f98f98 (diff)
downloadvolse-hubzilla-3d253309b79dd6264a7229c26f07506ddc9a28f6.tar.gz
volse-hubzilla-3d253309b79dd6264a7229c26f07506ddc9a28f6.tar.bz2
volse-hubzilla-3d253309b79dd6264a7229c26f07506ddc9a28f6.zip
Merge branch 'core_fixes' into 'dev'
fix summary and use item_normal_search() for viewsrc so we can also view the... See merge request hubzilla/core!1525
-rw-r--r--Zotlabs/Module/Viewsrc.php2
-rw-r--r--include/text.php7
2 files changed, 7 insertions, 2 deletions
diff --git a/Zotlabs/Module/Viewsrc.php b/Zotlabs/Module/Viewsrc.php
index b73d81283..3e49b9db4 100644
--- a/Zotlabs/Module/Viewsrc.php
+++ b/Zotlabs/Module/Viewsrc.php
@@ -25,7 +25,7 @@ class Viewsrc extends \Zotlabs\Web\Controller {
notice( t('Item not found.') . EOL);
}
- $item_normal = item_normal();
+ $item_normal = item_normal_search();
if(local_channel() && $item_id) {
$r = q("select id, mid, item_flags, mimetype, item_obscured, body, llink, plink from item where uid in (%d , %d) and id = %d $item_normal limit 1",
diff --git a/include/text.php b/include/text.php
index b017b038a..ad5f84b54 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1682,7 +1682,12 @@ function prepare_body(&$item,$attach = false,$opts = false) {
$s .= prepare_binary($item);
}
else {
- $s .= prepare_text($item['body'],$item['mimetype'], $opts);
+ if($item['summary']) {
+ $s .= prepare_text('[summary]' . $item['summary'] . '[/summary]' . $item['body'],$item['mimetype'],$opts);
+ }
+ else {
+ $s .= prepare_text($item['body'],$item['mimetype'], $opts);
+ }
}
$event = (($item['obj_type'] === ACTIVITY_OBJ_EVENT) ? format_event_obj($item['obj']) : false);