summaryrefslogtreecommitdiff
path: root/plugins/OStatus/actions/feedsubsettings.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-02-19 16:55:24 -0500
committerEvan Prodromou <evan@status.net>2010-02-19 16:55:24 -0500
commitd69f6dff6a0b62ddab929f6ba0801533a9031162 (patch)
tree2b49953ca2b5306a512f90e5d780cbe07d225b3c /plugins/OStatus/actions/feedsubsettings.php
parentb0327506a491f029b239ae703e1acb1d42ae299c (diff)
parenta1a3ab1c58cf8636c4e9ac6b9d44bdc18946a547 (diff)
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Conflicts: plugins/OStatus/actions/salmon.php
Diffstat (limited to 'plugins/OStatus/actions/feedsubsettings.php')
-rw-r--r--plugins/OStatus/actions/feedsubsettings.php8
1 files changed, 0 insertions, 8 deletions
diff --git a/plugins/OStatus/actions/feedsubsettings.php b/plugins/OStatus/actions/feedsubsettings.php
index 3e1d0aa82..aee4cee9a 100644
--- a/plugins/OStatus/actions/feedsubsettings.php
+++ b/plugins/OStatus/actions/feedsubsettings.php
@@ -68,14 +68,6 @@ class FeedSubSettingsAction extends ConnectSettingsAction
$profile = $user->getProfile();
- $fuser = null;
-
- $flink = Foreign_link::getByUserID($user->id, FEEDSUB_SERVICE);
-
- if (!empty($flink)) {
- $fuser = $flink->getForeignUser();
- }
-
$this->elementStart('form', array('method' => 'post',
'id' => 'form_settings_feedsub',
'class' => 'form_settings',