Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Michael Vogel 2013-08-05 20:34:10 +02:00
commit 004e02c5ca
17 changed files with 22 additions and 10 deletions

View file

@ -622,11 +622,12 @@ function twitter_post_hook(&$a,&$b) {
}
$msg = trim($msg);
} else
$image = "";
} else {
$msgarr = twitter_shortenmsg($b);
$msg = $msgarr["msg"];
$image = $msgarr["image"];
}
// and now tweet it :-)
if(strlen($msg) and ($image != "")) {
$img_str = fetch_url($image);