diff options
| author | 2015-03-23 21:59:07 +0100 | |
|---|---|---|
| committer | 2015-03-23 21:59:07 +0100 | |
| commit | a5e960acbe6e69043a52ec1788700a70779f313a (patch) | |
| tree | 1c70055809b0dca8b7ec1dbd828fe96e3a7135db /lib | |
| parent | 3aa15d95a854abe6cb694030cda06bc3d3b4ebd5 (diff) | |
| parent | 7735471140e1c6087a177192a09c7fb849decd77 (diff) | |
Merge remote-tracking branch 'origin/Logging' into dev
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/SimplePie/SimplePie/Misc.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/SimplePie/SimplePie/Misc.php b/lib/SimplePie/SimplePie/Misc.php index de50d37b8..91549f93a 100644 --- a/lib/SimplePie/SimplePie/Misc.php +++ b/lib/SimplePie/SimplePie/Misc.php @@ -2248,7 +2248,7 @@ function embed_wmedia(width, height, link) { */ function url_remove_credentials($url) //FreshRSS { - return preg_replace('#(?<=//)[^/:@]+:[^/:@]+@#', '', $url); + return preg_replace('#^(https?://)[^/:@]+:[^/:@]+@#i', '$1', $url); } } |
