diff options
author | Brion Vibber <brion@pobox.com> | 2010-03-22 12:37:45 -0700 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-03-22 12:37:45 -0700 |
commit | 26f49de0dd5673584e734152d2d3329b90eb6978 (patch) | |
tree | 2ba00544c77cc3bfe0cafb4fa8fe60ce73d31d79 /plugins/OStatus/lib/linkheader.php | |
parent | c85228eadc60b50ed6e7c9cba596c3e66f5214b2 (diff) | |
parent | 27bfd1211d64298ee3c3b2d82d7b38ca1e1167ad (diff) |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
Conflicts:
lib/attachmentlist.php
Diffstat (limited to 'plugins/OStatus/lib/linkheader.php')
-rw-r--r-- | plugins/OStatus/lib/linkheader.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/OStatus/lib/linkheader.php b/plugins/OStatus/lib/linkheader.php index afcd66d26..cd78d31ce 100644 --- a/plugins/OStatus/lib/linkheader.php +++ b/plugins/OStatus/lib/linkheader.php @@ -11,7 +11,7 @@ class LinkHeader preg_match('/^<[^>]+>/', $str, $uri_reference); //if (empty($uri_reference)) return; - $this->uri = trim($uri_reference[0], '<>'); + $this->href = trim($uri_reference[0], '<>'); $this->rel = array(); $this->type = null; |