harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'core_fixes' into 'dev'

Browse Source 
fix summary and use item_normal_search() for viewsrc so we can also view the...

See merge request hubzilla/core!1525
This commit is contained in:
M. Dent 2019-02-21 12:03:56 +01:00
commit 3d253309b7
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Module/Viewsrc.php
View File

@ -25,7 +25,7 @@ class Viewsrc extends \Zotlabs\Web\Controller {
notice( t('Item not found.') . EOL); notice( t('Item not found.') . EOL);
} }
$item_normal = item_normal(); $item_normal = item_normal_search();
if(local_channel() && $item_id) { 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", $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",

5
include/text.php
View File

@ -1681,9 +1681,14 @@ function prepare_body(&$item,$attach = false,$opts = false) {
if($item['item_obscured']) { if($item['item_obscured']) {
$s .= prepare_binary($item); $s .= prepare_binary($item);
} }
else {
if($item['summary']) {
$s .= prepare_text('[summary]' . $item['summary'] . '[/summary]' . $item['body'],$item['mimetype'],$opts);
}
else { else {
$s .= prepare_text($item['body'],$item['mimetype'], $opts); $s .= prepare_text($item['body'],$item['mimetype'], $opts);
} }
}
$event = (($item['obj_type'] === ACTIVITY_OBJ_EVENT) ? format_event_obj($item['obj']) : false); $event = (($item['obj_type'] === ACTIVITY_OBJ_EVENT) ? format_event_obj($item['obj']) : false);