Merge remote-tracking branch 'origin/Logging' into dev

This commit is contained in:
Alexandre Alapetite
2015-03-24 21:58:21 +01:00

View File

@@ -2246,7 +2246,7 @@ function embed_wmedia(width, height, link) {
* @param $url the URL to sanitize.
* @return the same URL without HTTP credentials.
*/
function url_remove_credentials($url) //FreshRSS
public static function url_remove_credentials($url) //FreshRSS
{
return preg_replace('#^(https?://)[^/:@]+:[^/:@]+@#i', '$1', $url);
}