diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-07-29 22:04:07 +0200 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-07-29 22:04:07 +0200 |
| commit | 98fa996b3f5125b60e2653bca2218b08041ad6a4 (patch) | |
| tree | 685c3909ac49f7a25cd39877f74ed56ada9b15e0 /include/text.php | |
| parent | 07e890a79a5c506b2e32272edf86ad4aba3b8fba (diff) | |
| parent | cbb6d37b6ca7e5d9e476fd3e7bea3ba56d3271e1 (diff) | |
| download | volse-hubzilla-98fa996b3f5125b60e2653bca2218b08041ad6a4.tar.gz volse-hubzilla-98fa996b3f5125b60e2653bca2218b08041ad6a4.tar.bz2 volse-hubzilla-98fa996b3f5125b60e2653bca2218b08041ad6a4.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/text.php')
| -rw-r--r-- | include/text.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/text.php b/include/text.php index be465d0f4..cc084f6f1 100644 --- a/include/text.php +++ b/include/text.php @@ -807,7 +807,7 @@ function contact_block() { $shown = get_pconfig($a->profile['uid'],'system','display_friend_count'); if($shown === false) - $shown = 24; + $shown = 25; if($shown == 0) return; @@ -1448,7 +1448,7 @@ function prepare_body(&$item,$attach = false) { // else { call_hooks('prepare_body_init', $item); // unobscure($item); - $s = prepare_text($item['body'],$item['mimetype'], true); + $s = prepare_text($item['body'],$item['mimetype'], false); // } $prep_arr = array('item' => $item, 'html' => $s); |