diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ping.php | 9 | ||||
| -rw-r--r-- | lib/util.php | 3 |
2 files changed, 10 insertions, 2 deletions
diff --git a/lib/ping.php b/lib/ping.php index be2933ae3..abf1c4048 100644 --- a/lib/ping.php +++ b/lib/ping.php @@ -27,7 +27,14 @@ function ping_broadcast_notice($notice) { # Array of servers, URL => type $notify = common_config('ping', 'notify'); - $profile = $notice->getProfile(); + try { + $profile = $notice->getProfile(); + } catch (Exception $e) { + // @todo: distinguish the 'broken notice/profile' case from more general + // transitory errors. + common_log(LOG_ERR, "Exception getting notice profile: " . $e->getMessage()); + return true; + } $tags = ping_notice_tags($notice); foreach ($notify as $notify_url => $type) { diff --git a/lib/util.php b/lib/util.php index f5077f601..5094b2712 100644 --- a/lib/util.php +++ b/lib/util.php @@ -342,7 +342,8 @@ function common_set_cookie($key, $value, $expiration=0) $value, $expiration, $cookiepath, - $server); + $server, + common_config('site', 'ssl')=='always'); } define('REMEMBERME', 'rememberme'); |