Some notices had been removed / expiring of item related tables in twitter #643

Merged
annando merged 2 commits from notices into develop 2018-07-15 20:40:21 +02:00
3 changed files with 7 additions and 1 deletions
Showing only changes of commit 7233145df6 - Show all commits

View file

@ -142,6 +142,10 @@ function leistungsschutzrecht_is_member_site($url) {
return false; return false;
} }
if (count($hostname) <= 2) {
return false;
}
$site = $hostname[sizeof($hostname) - 2].".".$hostname[sizeof($hostname) - 1]; $site = $hostname[sizeof($hostname) - 2].".".$hostname[sizeof($hostname) - 1];
return (isset($sites[$site])); return (isset($sites[$site]));

View file

@ -1125,6 +1125,8 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet
$receiptians = array_merge($receiptians, $post->to); $receiptians = array_merge($receiptians, $post->to);
} }
$public = false;
foreach ($receiptians AS $receiver) { foreach ($receiptians AS $receiver) {
if (is_string($receiver->objectType) && ($receiver->id == "http://activityschema.org/collection/public")) { if (is_string($receiver->objectType) && ($receiver->id == "http://activityschema.org/collection/public")) {
$public = true; $public = true;

View file

@ -412,7 +412,7 @@ function tumblr_send(&$a,&$b) {
$params['caption'] = '<h1>'.$title."</h1>". $params['caption'] = '<h1>'.$title."</h1>".
"<p>".$params['caption']."</p>"; "<p>".$params['caption']."</p>";
if (trim($params['caption']) == "") if (empty($params['caption']))
$params['caption'] = BBCode::convert("[quote]" . $siteinfo["description"] . "[/quote]", false, 4); $params['caption'] = BBCode::convert("[quote]" . $siteinfo["description"] . "[/quote]", false, 4);
$consumer_key = Config::get('tumblr','consumer_key'); $consumer_key = Config::get('tumblr','consumer_key');