diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php index b196167a..e371fd8e 100644 --- a/pumpio/pumpio.php +++ b/pumpio/pumpio.php @@ -672,7 +672,7 @@ function pumpio_action(App $a, $uid, $uri, $action, $content = "") if ($success) { Logger::log('pumpio_action '.$username.' '.$action.': success '.$uri); } else { - Logger::log('pumpio_action '.$username.' '.$action.': general error: '.$uri.' '.print_r($user, true)); + Logger::log('pumpio_action '.$username.' '.$action.': general error: '.$uri); Worker::defer(); } } diff --git a/statusnet/library/statusnetoauth.php b/statusnet/library/statusnetoauth.php index fa44eb9b..c9bb0163 100644 --- a/statusnet/library/statusnetoauth.php +++ b/statusnet/library/statusnetoauth.php @@ -15,6 +15,9 @@ class StatusNetOAuth extends TwitterOAuth function get_maxlength() { $config = $this->get($this->host . 'statusnet/config.json'); + if (empty($config)) { + return 0; + } return $config->site->textlimit; } diff --git a/twitter/twitter.php b/twitter/twitter.php index 38228503..bcbaabeb 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -1956,6 +1956,10 @@ function twitter_update_mentions($body) function twitter_convert_share(array $attributes, array $author_contact, $content, $is_quote_share) { + if (empty($contact)) { + return $content . "\n\n" . $attributes['link']; + } + if ($author_contact['network'] == Protocol::TWITTER) { $mention = '@' . $author_contact['nick']; } else {