mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-19 23:55:19 +00:00
re-arrange the html cache a bit
This commit is contained in:
parent
e68a00d381
commit
c10a4ca9c7
3 changed files with 19 additions and 12 deletions
|
@ -2491,6 +2491,8 @@ function item_store_update($arr,$allow_exec = false) {
|
|||
|
||||
$arr['title'] = ((array_key_exists('title',$arr) && strlen($arr['title'])) ? trim($arr['title']) : '');
|
||||
$arr['body'] = ((array_key_exists('body',$arr) && strlen($arr['body'])) ? trim($arr['body']) : '');
|
||||
$arr['html'] = ((array_key_exists('html',$arr) && strlen($arr['html'])) ? trim($arr['html']) : '');
|
||||
|
||||
$arr['attach'] = ((x($arr,'attach')) ? notags(trim($arr['attach'])) : $orig[0]['attach']);
|
||||
$arr['app'] = ((x($arr,'app')) ? notags(trim($arr['app'])) : $orig[0]['app']);
|
||||
// $arr['item_restrict'] = ((x($arr,'item_restrict')) ? intval($arr['item_restrict']) : $orig[0]['item_restrict'] );
|
||||
|
|
|
@ -1378,20 +1378,26 @@ function generate_named_map($location) {
|
|||
|
||||
function prepare_body(&$item,$attach = false) {
|
||||
|
||||
if($item['html'])
|
||||
return bb_observer($item['html']);
|
||||
if($item['html']) {
|
||||
$s = bb_observer($item['html']);
|
||||
}
|
||||
else {
|
||||
call_hooks('prepare_body_init', $item);
|
||||
unobscure($item);
|
||||
|
||||
call_hooks('prepare_body_init', $item);
|
||||
|
||||
|
||||
unobscure($item);
|
||||
|
||||
$s = prepare_text($item['body'],$item['mimetype'], true);
|
||||
$s = prepare_text($item['body'],$item['mimetype'], true);
|
||||
}
|
||||
|
||||
$prep_arr = array('item' => $item, 'html' => $s);
|
||||
call_hooks('prepare_body', $prep_arr);
|
||||
$s = $prep_arr['html'];
|
||||
|
||||
|
||||
q("update item set html = '%s' where id = %d",
|
||||
dbesc($prep_arr['html']),
|
||||
intval($item['id'])
|
||||
);
|
||||
|
||||
if(! $attach) {
|
||||
return $s;
|
||||
}
|
||||
|
@ -1452,10 +1458,6 @@ function prepare_body(&$item,$attach = false) {
|
|||
call_hooks('prepare_body_final', $prep_arr);
|
||||
|
||||
|
||||
q("update item set html = '%s' where id = %d",
|
||||
dbesc($prep_arr['html']),
|
||||
intval($item['id'])
|
||||
);
|
||||
|
||||
return $prep_arr['html'];
|
||||
}
|
||||
|
|
|
@ -2966,6 +2966,9 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) {
|
|||
. "' where abook_xchan = '" . dbesc($clean['abook_xchan']) . "' and abook_channel = " . intval($channel['channel_id']));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue