GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch 'master' into 0.7.x

Browse Source
This commit is contained in:
Evan Prodromou 2009-03-24 10:40:16 -04:00
commit 51d8b5d568
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/mail.php
View File

@ -554,17 +554,19 @@ function mail_notify_fave($other, $user, $notice)
$body = sprintf(_("%1\$s just added your notice from %2\$s". $body = sprintf(_("%1\$s just added your notice from %2\$s".
" as one of their favorites.\n\n" . " as one of their favorites.\n\n" .
"In case you forgot, you can see the text". "The URL of your notice is:\n\n" .
" of your notice here:\n\n" .
"%3\$s\n\n" . "%3\$s\n\n" .
"You can see the list of %1\$s's favorites here:\n\n" . "The text of your notice is:\n\n" .
"%4\$s\n\n" . "%4\$s\n\n" .
"You can see the list of %1\$s's favorites here:\n\n" .
"%5\$s\n\n" .
"Faithfully yours,\n" . "Faithfully yours,\n" .
"%5\$s\n"), "%6\$s\n"),
$bestname, $bestname,
common_exact_date($notice->created), common_exact_date($notice->created),
common_local_url('shownotice', common_local_url('shownotice',
array('notice' => $notice->id)), array('notice' => $notice->id)),
$notice->content,
common_local_url('showfavorites', common_local_url('showfavorites',
array('nickname' => $user->nickname)), array('nickname' => $user->nickname)),
common_config('site', 'name')); common_config('site', 'name'));

8
lib/ping.php
View File

@ -50,7 +50,15 @@ function ping_broadcast_notice($notice) {
"User-Agent: Laconica/".LACONICA_VERSION."\r\n", "User-Agent: Laconica/".LACONICA_VERSION."\r\n",
'content' => $req))); 'content' => $req)));
$file = file_get_contents($notify_url, false, $context); $file = file_get_contents($notify_url, false, $context);
if ($file === false || mb_strlen($file) == 0) {
common_log(LOG_WARNING,
"XML-RPC empty results for ping ($notify_url, $notice->id) ");
continue;
}
$response = xmlrpc_decode($file); $response = xmlrpc_decode($file);
if (xmlrpc_is_fault($response)) { if (xmlrpc_is_fault($response)) {
common_log(LOG_WARNING, common_log(LOG_WARNING,
"XML-RPC error for ping ($notify_url, $notice->id) ". "XML-RPC error for ping ($notify_url, $notice->id) ".