summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-03-04 10:16:59 -0800
committerBrion Vibber <brion@pobox.com>2010-03-04 10:16:59 -0800
commitf969d6349c244e2ec32c3ebe7eb355426006f4db (patch)
treeb66cd619681ffd868178ae3d4b8f6103adcc036e /lib
parentb218aee94e581230e1efa14d4ae1a19756986ddf (diff)
parentb720c7554be2a8e15c3772fe1071c48cf91935d6 (diff)
Merge branch 'testing' into 0.9.x
Conflicts: db/08to09.sql
Diffstat (limited to 'lib')
-rw-r--r--lib/activity.php32
-rw-r--r--lib/adminpanelaction.php10
-rw-r--r--lib/apiaction.php2
-rw-r--r--lib/default.php1
4 files changed, 20 insertions, 25 deletions
diff --git a/lib/activity.php b/lib/activity.php
index e1bce6f19..2cb80f9e1 100644
--- a/lib/activity.php
+++ b/lib/activity.php
@@ -344,16 +344,18 @@ class ActivityUtils
static function getLink(DOMNode $element, $rel, $type=null)
{
- $links = $element->getElementsByTagnameNS(self::ATOM, self::LINK);
+ $els = $element->childNodes;
- foreach ($links as $link) {
+ foreach ($els as $link) {
+ if ($link->localName == self::LINK && $link->namespaceURI == self::ATOM) {
- $linkRel = $link->getAttribute(self::REL);
- $linkType = $link->getAttribute(self::TYPE);
+ $linkRel = $link->getAttribute(self::REL);
+ $linkType = $link->getAttribute(self::TYPE);
- if ($linkRel == $rel &&
- (is_null($type) || $linkType == $type)) {
- return $link->getAttribute(self::HREF);
+ if ($linkRel == $rel &&
+ (is_null($type) || $linkType == $type)) {
+ return $link->getAttribute(self::HREF);
+ }
}
}
@@ -362,17 +364,19 @@ class ActivityUtils
static function getLinks(DOMNode $element, $rel, $type=null)
{
- $links = $element->getElementsByTagnameNS(self::ATOM, self::LINK);
+ $els = $element->childNodes;
$out = array();
- foreach ($links as $link) {
+ foreach ($els as $link) {
+ if ($link->localName == self::LINK && $link->namespaceURI == self::ATOM) {
- $linkRel = $link->getAttribute(self::REL);
- $linkType = $link->getAttribute(self::TYPE);
+ $linkRel = $link->getAttribute(self::REL);
+ $linkType = $link->getAttribute(self::TYPE);
- if ($linkRel == $rel &&
- (is_null($type) || $linkType == $type)) {
- $out[] = $link;
+ if ($linkRel == $rel &&
+ (is_null($type) || $linkType == $type)) {
+ $out[] = $link;
+ }
}
}
diff --git a/lib/adminpanelaction.php b/lib/adminpanelaction.php
index f3f86449f..a927e2333 100644
--- a/lib/adminpanelaction.php
+++ b/lib/adminpanelaction.php
@@ -194,16 +194,6 @@ class AdminPanelAction extends Action
}
/**
- * There is no data for aside, so, we don't output
- *
- * @return nothing
- */
- function showAside()
- {
-
- }
-
- /**
* show human-readable instructions for the page, or
* a success/failure on save.
*
diff --git a/lib/apiaction.php b/lib/apiaction.php
index eef0ba637..e4a1df3d1 100644
--- a/lib/apiaction.php
+++ b/lib/apiaction.php
@@ -86,7 +86,7 @@ class ApiAction extends Action
$this->since_id = (int)$this->arg('since_id', 0);
if ($this->arg('since')) {
- $this->clientError(_("since parameter is disabled for performance; use since_id"), 403);
+ header('X-StatusNet-Warning: since parameter is disabled; use since_id');
}
return true;
diff --git a/lib/default.php b/lib/default.php
index c46c3eef5..f22d8b24a 100644
--- a/lib/default.php
+++ b/lib/default.php
@@ -280,6 +280,7 @@ $default =
'TightUrl' => array('shortenerName' => '2tu.us', 'freeService' => true,'serviceUrl'=>'http://2tu.us/?save=y&url=%1$s'),
'Geonames' => null,
'Mapstraction' => null,
+ 'OStatus' => null,
'WikiHashtags' => null,
'RSSCloud' => null,
'OpenID' => null),