diff --git a/lib/jsonsearchresultslist.php b/lib/jsonsearchresultslist.php index 8bf3678d4f..c9b2705991 100644 --- a/lib/jsonsearchresultslist.php +++ b/lib/jsonsearchresultslist.php @@ -232,10 +232,15 @@ class ResultItem $this->id = $this->notice->id; $this->from_user_id = $this->profile->id; - $user = User::staticGet('id', $this->profile->id); - - $this->iso_language_code = $user->language; + $user = $this->profile->getUser(); + if (empty($user)) { + // Gonna have to do till we can detect it + $this->iso_language_code = common_config('site', 'language'); + } else { + $this->iso_language_code = $user->language; + } + $this->source = $this->getSourceLink($this->notice->source); $avatar = $this->profile->getAvatar(AVATAR_STREAM_SIZE); diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php index 5eb23fb627..0fa51ce861 100644 --- a/plugins/Realtime/RealtimePlugin.php +++ b/plugins/Realtime/RealtimePlugin.php @@ -253,7 +253,9 @@ class RealtimePlugin extends Plugin list($action, $arg1, $arg2) = $path; $channels = Realtime_channel::getAllChannels($action, $arg1, $arg2); - $this->log(LOG_INFO, sprintf(_("%d candidate channels for notice %d"), $notice->id)); + $this->log(LOG_INFO, sprintf(_("%d candidate channels for notice %d"), + count($channels), + $notice->id)); foreach ($channels as $channel) { diff --git a/plugins/TwitterBridge/daemons/twitterdaemon.php b/plugins/TwitterBridge/daemons/twitterdaemon.php index d313d2de96..8b774889d1 100644 --- a/plugins/TwitterBridge/daemons/twitterdaemon.php +++ b/plugins/TwitterBridge/daemons/twitterdaemon.php @@ -23,7 +23,7 @@ define('INSTALLDIR', realpath(dirname(__FILE__) . '/../../..')); $shortoptions = 'fi::a'; $longoptions = array('id::', 'foreground', 'all'); -$helptext = <<