projects
/
quix0rs-gnu-social.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f7b2bb0
)
SubMirror: check feel-url discovery if profile-url discovery failed; should help...
author
Brion Vibber
<brion@pobox.com>
Fri, 13 Aug 2010 18:02:21 +0000
(11:02 -0700)
committer
Brion Vibber
<brion@pobox.com>
Fri, 13 Aug 2010 19:23:32 +0000
(12:23 -0700)
plugins/SubMirror/actions/basemirror.php
patch
|
blob
|
history
diff --git
a/plugins/SubMirror/actions/basemirror.php
b/plugins/SubMirror/actions/basemirror.php
index 5be0699f09b10f774334824e9df06efba618f22b..be6942efa7ca3a263a85954dfdf0f10d644ecd04 100644
(file)
--- a/
plugins/SubMirror/actions/basemirror.php
+++ b/
plugins/SubMirror/actions/basemirror.php
@@
-92,7
+92,13
@@
abstract class BaseMirrorAction extends Action
*/
protected function profileForFeed($url)
{
- $oprofile = Ostatus_profile::ensureProfileURL($url);
+ try {
+ // Maybe we got a web page?
+ $oprofile = Ostatus_profile::ensureProfileURL($url);
+ } catch (Exception $e) {
+ // Direct feed URL?
+ $oprofile = Ostatus_profile::ensureFeedURL($url);
+ }
if ($oprofile->isGroup()) {
$this->clientError(_m("Can't mirror a StatusNet group at this time."));
}