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

Merge branch 'master' into tres

Browse Source
This commit is contained in:
friendica
2015-05-01 13:19:19 -07:00
parent c4221f3273 e4fe068ed5
commit b467dc4f00
5 changed files with 37 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/text.php
View File

@@ -1185,6 +1185,14 @@ function unobscure(&$item) {
$item['title'] = crypto_unencapsulate(json_decode_plus($item['title']),$key);
if($item['body'])
$item['body'] = crypto_unencapsulate(json_decode_plus($item['body']),$key);
if(get_config('system','item_cache')) {
q("update item set title = '%s', body = '%s', item_flags = %d where id = %d",
dbesc($item['title']),
dbesc($item['body']),
intval($item['item_flags'] - ITEM_OBSCURED),
intval($item['id'])
);
}
}
}
@@ -1371,8 +1379,12 @@ function generate_named_map($location) {
function prepare_body(&$item,$attach = false) {
if(get_config('system','item_cache') && $item['html'])
return $item['html'];
call_hooks('prepare_body_init', $item);
unobscure($item);
$s = prepare_text($item['body'],$item['mimetype']);
@@ -1440,6 +1452,12 @@ function prepare_body(&$item,$attach = false) {
$prep_arr = array('item' => $item, 'html' => $s);
call_hooks('prepare_body_final', $prep_arr);
if(get_config('system','item_cache'))
q("update item set html = '%s' where id = %d",
dbesc($prep_arr['html']),
intval($item['id'])
);
return $prep_arr['html'];
}