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

Merge branch 'master' into tres and add some work on the item_deleted flag refactor

Browse Source 
Conflicts:
	include/attach.php
	include/onedirsync.php
	include/zot.php
	mod/locs.php
This commit is contained in:
friendica
2015-01-26 18:27:03 -08:00
parent e6bfe3f2c1 9f5bfca28d
commit ac594183c6
99 changed files with 1877 additions and 2011 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/text.php
View File

@@ -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;