aboutsummaryrefslogtreecommitdiff
path: root/app/Models/Feed.php
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2015-03-22 22:54:56 +0100
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2015-03-22 22:54:56 +0100
commitb628fb107d6aeabdc25c1f33fa48f662af727f72 (patch)
tree0ab674b64a9edba5110c140e023c1bef08becbd3 /app/Models/Feed.php
parent92621345f9a8303e743133e28c7638f90706f9c5 (diff)
parentad9fe52f5a76faf58d13fcf7bde8f58e85abe82b (diff)
Merge remote-tracking branch 'origin/Logging' into dev
Diffstat (limited to 'app/Models/Feed.php')
-rw-r--r--app/Models/Feed.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/Models/Feed.php b/app/Models/Feed.php
index 5f67ea6ce..15cbb7d0a 100644
--- a/app/Models/Feed.php
+++ b/app/Models/Feed.php
@@ -240,7 +240,7 @@ class FreshRSS_Feed extends Minz_Model {
$subscribe_url = $feed->subscribe_url(true);
}
- $clean_url = url_remove_credentials($subscribe_url);
+ $clean_url = SimplePie_Misc::url_remove_credentials($subscribe_url);
if ($subscribe_url !== null && $subscribe_url !== $url) {
$this->_url($clean_url);
}