fix check for parent of StatusNet API post

diff --git a/include/api.php b/include/api.php
index b77156dfaefbe6ea319f827dedbcb717cc126977..cee1fde23bfd1c94869df0cfbeaa175e3b1e61f8 100644 (file)
--- a/include/api.php
+++ b/include/api.php
@@ -565,18 +565,19 @@
                if(requestdata('lat') && requestdata('long'))
                        $_REQUEST['coord'] = sprintf("%s %s",requestdata('lat'),requestdata('long'));
                $_REQUEST['profile_uid'] = local_user();
-               if(requestdata('parent'))
+//             if(requestdata('parent'))
+               if($parent)
                        $_REQUEST['type'] = 'net-comment';
                else {
                        $_REQUEST['type'] = 'wall';
-                        if(x($_FILES,'media')) {
-                               // upload the image if we have one
-                               $_REQUEST['hush']='yeah'; //tell wall_upload function to return img info instead of echo
-                               require_once('mod/wall_upload.php');
-                               $media = wall_upload_post($a);
-                               if(strlen($media)>0)
-                                       $_REQUEST['body'] .= "\n\n".$media;
-                               }
+                       if(x($_FILES,'media')) {
+                               // upload the image if we have one
+                               $_REQUEST['hush']='yeah'; //tell wall_upload function to return img info instead of echo
+                               require_once('mod/wall_upload.php');
+                               $media = wall_upload_post($a);
+                               if(strlen($media)>0)
+                                       $_REQUEST['body'] .= "\n\n".$media;
+                       }
                }
 
                // set this so that the item_post() function is quiet and doesn't redirect or emit json

diff --git a/include/onepoll.php b/include/onepoll.php
index d68f268837d1aac2147b8dfc69cc22a214aab705..09e7bb7638d85885f1f64ab87984f2ac0abb455f 100644 (file)
--- a/include/onepoll.php
+++ b/include/onepoll.php
@@ -449,7 +449,7 @@ function onepoll_run($argv, $argc){
 
        if($xml) {
                logger('poller: received xml : ' . $xml, LOGGER_DATA);
-                       if((! strstr($xml,'<?xml')) && (! strstr($xml,'<rss'))) {
+               if((! strstr($xml,'<?xml')) && (! strstr($xml,'<rss'))) {
                        logger('poller: post_handshake: response from ' . $url . ' did not contain XML.');
                        $r = q("UPDATE `contact` SET `last-update` = '%s' WHERE `id` = %d LIMIT 1",
                                dbesc(datetime_convert()),

diff --git a/mod/item.php b/mod/item.php
index c1c0b14ec6cd507acb1f51f43857e0755f949c8c..54f9fc06aaf5d5a87aa862fd7794e629960d953f 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -108,7 +108,7 @@ function item_post(&$a) {
                }
        }
 
-       if($parent) logger('mod_post: parent=' . $parent);
+       if($parent) logger('mod_item: item_post parent=' . $parent);
 
        $profile_uid = ((x($_REQUEST,'profile_uid')) ? intval($_REQUEST['profile_uid']) : 0);
        $post_id     = ((x($_REQUEST,'post_id'))     ? intval($_REQUEST['post_id'])     : 0);