From: James Walker <walkah@walkah.net>
Date: Sat, 13 Mar 2010 15:37:08 +0000 (-0500)
Subject: * wrong param order to in_array
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a9dabbe77e8ab575aaf5c3742e2cddb4874e6881;p=quix0rs-gnu-social.git

* wrong param order to in_array
* in getContent() if "type" isn't set, assume text (per atom spec)
---

diff --git a/lib/activity.php b/lib/activity.php
index 125d391b04..738200c0bf 100644
--- a/lib/activity.php
+++ b/lib/activity.php
@@ -457,7 +457,7 @@ class ActivityUtils
 
             // slavishly following http://atompub.org/rfc4287.html#rfc.section.4.1.3.3
 
-            if ($type == 'text') {
+            if (empty($type) || $type == 'text') {
                 return $contentEl->textContent;
             } else if ($type == 'html') {
                 $text = $contentEl->textContent;
@@ -476,7 +476,7 @@ class ActivityUtils
                     $text .= $doc->saveXML($child);
                 }
                 return trim($text);
-            } else if (in_array(array('text/xml', 'application/xml'), $type) ||
+            } else if (in_array($type, array('text/xml', 'application/xml')) ||
                        preg_match('#(+|/)xml$#', $type)) {
                 throw new ClientException(_("Can't handle embedded XML content yet."));
             } else if (strncasecmp($type, 'text/', 5)) {