summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-03-24 10:40:16 -0400
committerEvan Prodromou <evan@controlyourself.ca>2009-03-24 10:40:16 -0400
commit51d8b5d568027c89006073aa98f2afae7e871873 (patch)
tree49b35c432d13bf34e21025668ea5c699f75b61d1 /lib
parent24ce3928e3599389bf80931f4149f3485e505360 (diff)
parenta148569705b252c334925160a7972c3da140e374 (diff)
Merge branch 'master' into 0.7.x
Diffstat (limited to 'lib')
-rw-r--r--lib/mail.php10
-rw-r--r--lib/ping.php8
2 files changed, 14 insertions, 4 deletions
diff --git a/lib/mail.php b/lib/mail.php
index dde7571eb..27a1d99dc 100644
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -554,17 +554,19 @@ function mail_notify_fave($other, $user, $notice)
$body = sprintf(_("%1\$s just added your notice from %2\$s".
" as one of their favorites.\n\n" .
- "In case you forgot, you can see the text".
- " of your notice here:\n\n" .
+ "The URL of your notice is:\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" .
+ "You can see the list of %1\$s's favorites here:\n\n" .
+ "%5\$s\n\n" .
"Faithfully yours,\n" .
- "%5\$s\n"),
+ "%6\$s\n"),
$bestname,
common_exact_date($notice->created),
common_local_url('shownotice',
array('notice' => $notice->id)),
+ $notice->content,
common_local_url('showfavorites',
array('nickname' => $user->nickname)),
common_config('site', 'name'));
diff --git a/lib/ping.php b/lib/ping.php
index d7472b920..3de541e9a 100644
--- a/lib/ping.php
+++ b/lib/ping.php
@@ -50,7 +50,15 @@ function ping_broadcast_notice($notice) {
"User-Agent: Laconica/".LACONICA_VERSION."\r\n",
'content' => $req)));
$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);
+
if (xmlrpc_is_fault($response)) {
common_log(LOG_WARNING,
"XML-RPC error for ping ($notify_url, $notice->id) ".