wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing

Browse Source
This commit is contained in:
Evan Prodromou 2010-02-21 14:18:16 -05:00
commit 4209082677
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
actions/doc.php
View File

@ -173,6 +173,10 @@ class DocAction extends Action
} }
$local = glob(INSTALLDIR.'/local/doc-src/'.$this->title.'.*'); $local = glob(INSTALLDIR.'/local/doc-src/'.$this->title.'.*');
if ($local === false) {
// Some systems return false, others array(), if dir didn't exist.
$local = array();
}
if (count($local) || isset($localDef)) { if (count($local) || isset($localDef)) {
return $this->negotiateLanguage($local, $localDef); return $this->negotiateLanguage($local, $localDef);
@ -183,6 +187,9 @@ class DocAction extends Action
} }
$dist = glob(INSTALLDIR.'/doc-src/'.$this->title.'.*'); $dist = glob(INSTALLDIR.'/doc-src/'.$this->title.'.*');
if ($dist === false) {
$dist = array();
}
if (count($dist) || isset($distDef)) { if (count($dist) || isset($distDef)) {
return $this->negotiateLanguage($dist, $distDef); return $this->negotiateLanguage($dist, $distDef);

1
plugins/OStatus/lib/salmonaction.php
View File

@ -51,6 +51,7 @@ class SalmonAction extends Action
if ($dom->documentElement->namespaceURI != Activity::ATOM || if ($dom->documentElement->namespaceURI != Activity::ATOM ||
$dom->documentElement->localName != 'entry') { $dom->documentElement->localName != 'entry') {
common_log(LOG_DEBUG, "Got invalid Salmon post: $xml");
$this->clientError(_m('Salmon post must be an Atom entry.')); $this->clientError(_m('Salmon post must be an Atom entry.'));
} }
// XXX: check the signature // XXX: check the signature