diff options
| author | friendica <info@friendica.com> | 2015-01-26 18:27:03 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-01-26 18:27:03 -0800 |
| commit | ac594183c6fdc6cf4d5a2a29ade7478a17336397 (patch) | |
| tree | d38f73727da4d8697b00d2102ae10b501d1909ce /include/text.php | |
| parent | e6bfe3f2c10e851ed5ba49886ec8d0a9a9de2296 (diff) | |
| parent | 9f5bfca28dde23893156ad36682e20ca2fc0dd45 (diff) | |
| download | volse-hubzilla-ac594183c6fdc6cf4d5a2a29ade7478a17336397.tar.gz volse-hubzilla-ac594183c6fdc6cf4d5a2a29ade7478a17336397.tar.bz2 volse-hubzilla-ac594183c6fdc6cf4d5a2a29ade7478a17336397.zip | |
Merge branch 'master' into tres and add some work on the item_deleted flag refactor
Conflicts:
include/attach.php
include/onedirsync.php
include/zot.php
mod/locs.php
Diffstat (limited to 'include/text.php')
| -rw-r--r-- | include/text.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/text.php b/include/text.php index 101d6ca2e..2aa270f3b 100644 --- a/include/text.php +++ b/include/text.php @@ -897,7 +897,8 @@ function sslify($s) { $cnt = preg_match_all("/\<(.*?)src=\"(http\:.*?)\"(.*?)\>/",$s,$matches,PREG_SET_ORDER); if($cnt) { foreach($matches as $match) { - $s = str_replace($match[2],z_root() . '/sslify?f=&url=' . urlencode($match[2]),$s); + $filename = basename( parse_url($match[2],PHP_URL_PATH) ); + $s = str_replace($match[2],z_root() . '/sslify/' . $filename . '?f=&url=' . urlencode($match[2]),$s); } } return $s; |