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

Merge branch 'master' of https://github.com/redmatrix/redmatrix

Browse Source 
Conflicts:
	include/items.php
	include/text.php
	mod/item.php
	view/nl/messages.po
This commit is contained in:
redmatrix
2015-05-20 20:49:06 -07:00
parent c10a4ca9c7 62df06b3d6
commit 3763f74a10
13 changed files with 151 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/text.php
View File

@@ -1384,7 +1384,6 @@ function prepare_body(&$item,$attach = false) {
else {
call_hooks('prepare_body_init', $item);
unobscure($item);
$s = prepare_text($item['body'],$item['mimetype'], true);
}
@@ -1392,9 +1391,8 @@ function prepare_body(&$item,$attach = false) {
call_hooks('prepare_body', $prep_arr);
$s = $prep_arr['html'];
q("update item set html = '%s' where id = %d",
dbesc($prep_arr['html']),
dbesc($s),
intval($item['id'])
);
@@ -1456,9 +1454,6 @@ function prepare_body(&$item,$attach = false) {
$prep_arr = array('item' => $item, 'html' => $s);
call_hooks('prepare_body_final', $prep_arr);
return $prep_arr['html'];
}