diff options
| author | Manuel Jiménez Friaza <mjfriaza@openmailbox.org> | 2019-01-20 12:58:27 +0100 |
|---|---|---|
| committer | Manuel Jiménez Friaza <mjfriaza@openmailbox.org> | 2019-01-20 12:58:27 +0100 |
| commit | 4e8fc6d19851b6d05a49d5151aaa1f0f1fcfb5c0 (patch) | |
| tree | 49111cffad0616616f4ce76fed9dd6b4fad8e41f /include/text.php | |
| parent | 618d673947dc627dcdac3f9b6da7f31123472b05 (diff) | |
| parent | 39128c34ccf48cc23ed368cf5bbedd71b5ef75db (diff) | |
| download | volse-hubzilla-4e8fc6d19851b6d05a49d5151aaa1f0f1fcfb5c0.tar.gz volse-hubzilla-4e8fc6d19851b6d05a49d5151aaa1f0f1fcfb5c0.tar.bz2 volse-hubzilla-4e8fc6d19851b6d05a49d5151aaa1f0f1fcfb5c0.zip | |
Merge remote-tracking branch 'upstream/dev' into dev
Diffstat (limited to 'include/text.php')
| -rw-r--r-- | include/text.php | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/include/text.php b/include/text.php index bd0d8048d..26cb61977 100644 --- a/include/text.php +++ b/include/text.php @@ -1691,7 +1691,14 @@ function prepare_body(&$item,$attach = false,$opts = false) { if(local_channel() == $item['uid']) $filer = format_filer($item); - $s = sslify($s); + if($s) + $s = sslify($s); + + if($photo) + $photo = sslify($photo); + + if($event) + $event = sslify($event); $prep_arr = array( 'item' => $item, @@ -3305,8 +3312,6 @@ function cleanup_bbcode($body) { $body = preg_replace('/\[\/code\]\s*\[code\]/ism',"\n",$body); - $body = scale_external_images($body, false); - return $body; } |