aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-06-25 14:19:48 -0700
committerfriendica <info@friendica.com>2012-06-25 14:19:48 -0700
commitcb1d35fb0958cf699adc4c4aacc75587b2c25f85 (patch)
treed9f66cce9af6f09054a423e41c7e557a021fc824
parentd0e14809fd7cd9783b84915c4fe94ee08d4a72aa (diff)
parentfa7e803f73586ca056506a85dbb7b34f26498d2f (diff)
downloadvolse-hubzilla-cb1d35fb0958cf699adc4c4aacc75587b2c25f85.tar.gz
volse-hubzilla-cb1d35fb0958cf699adc4c4aacc75587b2c25f85.tar.bz2
volse-hubzilla-cb1d35fb0958cf699adc4c4aacc75587b2c25f85.zip
Merge pull request #359 from fermionic/mustard-prevent-comment-doubles
fix check for parent of StatusNet API post
-rw-r--r--include/api.php19
-rw-r--r--include/onepoll.php2
-rw-r--r--mod/item.php2
3 files changed, 12 insertions, 11 deletions
diff --git a/include/api.php b/include/api.php
index b77156dfa..cee1fde23 100644
--- 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 d68f26883..09e7bb763 100644
--- 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 c1c0b14ec..54f9fc06a 100644
--- 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);