diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-06-03 04:59:07 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-06-03 04:59:07 -0400 |
| commit | 598a2563e844477de2f688663c7c46962b26b602 (patch) | |
| tree | 525a6536b6ab7f9020e83daf9287c785303ad584 /include/text.php | |
| parent | 8503a0e4cc4a5e01d8a30b4a827524d1bf313fc6 (diff) | |
| parent | daa4f5213f726b22846859f2f12d06889e9bdc9b (diff) | |
| download | volse-hubzilla-598a2563e844477de2f688663c7c46962b26b602.tar.gz volse-hubzilla-598a2563e844477de2f688663c7c46962b26b602.tar.bz2 volse-hubzilla-598a2563e844477de2f688663c7c46962b26b602.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
zrl's when visiting public photos at the source site
doco
cleanup
turn "follow" into a function
add hometown to profiles
bug #439 - remove web port number from notification email "from" address
webfinger profile linker
"howlong" added to marital status.
fewer "bob smith to bob smith via wall-to-wall".
[quote=somebody] was appearing as an extended spoiler tag.
* master:
Diffstat (limited to 'include/text.php')
| -rw-r--r-- | include/text.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/text.php b/include/text.php index 376ac473d..d4a4d5580 100644 --- a/include/text.php +++ b/include/text.php @@ -891,6 +891,7 @@ function prepare_body($item,$attach = false) { } else $s = prepare_text($item['body']); + $prep_arr = array('item' => $item, 'html' => $s); call_hooks('prepare_body', $prep_arr); $s = $prep_arr['html']; |