summaryrefslogtreecommitdiff
path: root/plugins/OStatus/actions/ostatussub.php
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-03-03 18:23:28 -0800
committerBrion Vibber <brion@pobox.com>2010-03-03 18:23:28 -0800
commita4d9171306a06983094fdc90dbf040335c4f803f (patch)
tree1d9d7d4e88f35e7bacfa8f7d5ad82d2ee441f6ad /plugins/OStatus/actions/ostatussub.php
parent6a5a629afac881fdc8369dfef2924f7f62949fab (diff)
Fix up catching of webfinger setup fails
Diffstat (limited to 'plugins/OStatus/actions/ostatussub.php')
-rw-r--r--plugins/OStatus/actions/ostatussub.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/plugins/OStatus/actions/ostatussub.php b/plugins/OStatus/actions/ostatussub.php
index 7ca8a7869..e8a2c78ae 100644
--- a/plugins/OStatus/actions/ostatussub.php
+++ b/plugins/OStatus/actions/ostatussub.php
@@ -260,7 +260,7 @@ class OStatusSubAction extends Action
$this->error = _m('Could not find a feed linked from this URL.');
} catch (FeedSubUnrecognizedTypeException $e) {
$this->error = _m('Not a recognized feed type.');
- } catch (FeedSubException $e) {
+ } catch (Exception $e) {
// Any new ones we forgot about
$this->error = sprintf(_m('Bad feed URL: %s %s'), get_class($e), $e->getMessage());
}
@@ -315,7 +315,6 @@ class OStatusSubAction extends Action
if ($this->pullRemoteProfile()) {
$this->validateRemoteProfile();
}
-
return true;
}