aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2015-03-22 23:57:27 +0100
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2015-03-22 23:57:27 +0100
commit3aa15d95a854abe6cb694030cda06bc3d3b4ebd5 (patch)
tree0ab674b64a9edba5110c140e023c1bef08becbd3 /lib
parentc83d30db64a6297ed6af44e7029d108cac8441c7 (diff)
parent0ed213d97f566d7f46747d28a318cf58cdb5d699 (diff)
Merge remote-tracking branch 'origin/Logging' into dev
Diffstat (limited to 'lib')
-rw-r--r--lib/SimplePie/SimplePie/Misc.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/SimplePie/SimplePie/Misc.php b/lib/SimplePie/SimplePie/Misc.php
index 90f01f737..de50d37b8 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('#(?<=^https?://)[^/:@]+:[^/:@]+@#', '', $url);
+ return preg_replace('#(?<=//)[^/:@]+:[^/:@]+@#', '', $url);
}
}