toddy/friendica-addons
1
0
Fork 0
forked from friendica/friendica-addons
Code Pull requests Activity

Merge pull request #973 from annando/notices

Browse source 
Fixing some notices
This commit is contained in:
Tobias Diekershoff 2020-04-04 15:31:13 +02:00 committed by GitHub
commit cb34593770
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pumpio/pumpio.php
View file

@ -672,7 +672,7 @@ function pumpio_action(App $a, $uid, $uri, $action, $content = "")
if ($success) { if ($success) {
Logger::log('pumpio_action '.$username.' '.$action.': success '.$uri); Logger::log('pumpio_action '.$username.' '.$action.': success '.$uri);
} else { } 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(); Worker::defer();
} }
} }

3
statusnet/library/statusnetoauth.php
View file

@ -15,6 +15,9 @@ class StatusNetOAuth extends TwitterOAuth
function get_maxlength() function get_maxlength()
{ {
$config = $this->get($this->host . 'statusnet/config.json'); $config = $this->get($this->host . 'statusnet/config.json');
if (empty($config)) {
return 0;
}
return $config->site->textlimit; return $config->site->textlimit;
} }

4
twitter/twitter.php
View file

@ -1956,6 +1956,10 @@ function twitter_update_mentions($body)
function twitter_convert_share(array $attributes, array $author_contact, $content, $is_quote_share) 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) { if ($author_contact['network'] == Protocol::TWITTER) {
$mention = '@' . $author_contact['nick']; $mention = '@' . $author_contact['nick'];
} else { } else {