friendica/friendica-addons
7
2
Fork 14
Code Issues 3 Pull requests 3 Releases 16 Wiki Activity

Bugfix in wppost, improvement in libertree export and changes in statusnet and twitter #62

Merged
annando merged 32 commits from master into master 2012-06-23 14:10:19 +02:00
Conversation 0 Commits 32 Files changed 9 +16 -7
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit eeed84f200 - Show all commits

23
tumblr/tumblr.php
View file

@ -168,22 +168,31 @@ function tumblr_send(&$a,&$b) {
if(count($tag_arr))
$tags = implode(',',$tag_arr);
$link = "";
if ($b['title'] == '') {
// Take the description from the bookmark
if(preg_match("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/is",$b['body'],$matches))
$b['title'] = $matches[2];
$link = $matches[1];
$b['title'] = html_entity_decode($matches[2],ENT_QUOTES,'UTF-8');
}
$params = array(
'email' => $tmbl_username,
'password' => $tmbl_password,
'title' => $b['title'],
'type' => 'regular',
'format' => 'html',
'generator' => 'Friendica',
'tags' => $tags,
'body' => bbcode($b['body'])
);
'tags' => $tags);
if ($link != '') {
$params['type'] = "link";
$params['name'] = $b['title'],
$params['url'] = $link;
$params['description'] = bbcode($b['body']);
} else {
$params['type'] = "regular";
$params['title'] = $b['title'],
$params['body'] = bbcode($b['body']);
}
$x = post_url($tmbl_blog,$params);
$ret_code = $a->get_curl_code();
@ -192,7 +201,7 @@ function tumblr_send(&$a,&$b) {
elseif($ret_code == 403)
logger('tumblr_send: authentication failure');
else
logger('tumblr_send: general error: ' . print_r($x,true));
logger('tumblr_send: general error: ' . print_r($x,true));
}
}