Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-19 13:03:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4598 from MrPetovan/spoiler-cache

Browse source 
Fix for CW: Items weren't cached (alt)
This commit is contained in:
Michael Vogel 2018-03-15 10:29:35 +01:00 committed by GitHub
commit fc6576fd83
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
include/text.php
View file

@ -1169,8 +1169,25 @@ function redir_private_images($a, &$item)
} }
} }
/**
* Sets the "rendered-html" field of the provided item
*
* Body is preserved to avoid side-effects as we modify it just-in-time for spoilers and private image links
*
* @param array $item
* @param bool $update
*
* @todo Remove reference, simply return "rendered-html" and "rendered-hash"
*/
function put_item_in_cache(&$item, $update = false) function put_item_in_cache(&$item, $update = false)
{ {
$body = $item["body"];
// Add the content warning
if (!empty($item['content-warning'])) {
$item["body"] = $item['content-warning'] . '[spoiler]' . $item["body"] . '[/spoiler]';
}
$rendered_hash = defaults($item, 'rendered-hash', ''); $rendered_hash = defaults($item, 'rendered-hash', '');
if ($rendered_hash == '' if ($rendered_hash == ''
@ -1178,27 +1195,19 @@ function put_item_in_cache(&$item, $update = false)
|| $rendered_hash != hash("md5", $item["body"]) || $rendered_hash != hash("md5", $item["body"])
|| Config::get("system", "ignore_cache") || Config::get("system", "ignore_cache")
) { ) {
// The function "redir_private_images" changes the body.
// I'm not sure if we should store it permanently, so we save the old value.
$body = $item["body"];
// Add the content warning
if (!empty($item['content-warning'])) {
$item["body"] = $item['content-warning'] . '[spoiler]' . $item["body"] . '[/spoiler]';
}
$a = get_app(); $a = get_app();
redir_private_images($a, $item); redir_private_images($a, $item);
$item["rendered-html"] = prepare_text($item["body"]); $item["rendered-html"] = prepare_text($item["body"]);
$item["rendered-hash"] = hash("md5", $item["body"]); $item["rendered-hash"] = hash("md5", $item["body"]);
$item["body"] = $body;
if ($update && ($item["id"] > 0)) { if ($update && ($item["id"] > 0)) {
dba::update('item', ['rendered-html' => $item["rendered-html"], 'rendered-hash' => $item["rendered-hash"]], dba::update('item', ['rendered-html' => $item["rendered-html"], 'rendered-hash' => $item["rendered-hash"]],
['id' => $item["id"]], false); ['id' => $item["id"]], false);
} }
} }
$item["body"] = $body;
} }
/** /**