diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2015-03-24 21:58:21 +0100 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2015-03-24 21:58:21 +0100 |
| commit | 6032caad2faac060a95a56eb8e1bb80f6c0df9e9 (patch) | |
| tree | 1901eb9d2f6efbe57f346cfc2ebd1a01751b25a2 /lib | |
| parent | 800f28a5db367d77918cd3ee83a2d0683eb84dfd (diff) | |
| parent | 2bfc4dbf8b19cd2b892526ef65a966ff3bfef718 (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 91549f93a..956a284cb 100644 --- a/lib/SimplePie/SimplePie/Misc.php +++ b/lib/SimplePie/SimplePie/Misc.php @@ -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); } |