diff options
| author | Evan Prodromou <evan@status.net> | 2009-09-16 11:57:26 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2009-09-16 11:57:26 -0400 |
| commit | aef434f9b2a8865facc34270cc0f19e8b7967f79 (patch) | |
| tree | 715e89e1b48520de5772c67ea5a9e01b242ee8b0 /plugins | |
| parent | 5ab1ec7ad578e1ac1f2d18ad8e2299cda21f572a (diff) | |
| parent | 6568a3202d3acfde694b359e2524d52d93dc83dd (diff) | |
Merge branch '0.8.x' of git@gitorious.org:statusnet/mainline into 0.8.x
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/Autocomplete/autocomplete.php | 2 | ||||
| -rw-r--r-- | plugins/Realtime/realtimeupdate.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/Autocomplete/autocomplete.php b/plugins/Autocomplete/autocomplete.php index 96d54af8d..4379a86f2 100644 --- a/plugins/Autocomplete/autocomplete.php +++ b/plugins/Autocomplete/autocomplete.php @@ -62,7 +62,7 @@ class AutocompleteAction extends Action $user->whereAdd('nickname like \'' . trim($user->escape($q), '\'') . '%\''); $user->find(); while($user->fetch()) { - $profile = Profile::pkeyGet(array('id' => $user->id)); + $profile = Profile::staticGet($user->id); $this->results[]=array('nickname' => $user->nickname, 'fullname'=> $profile->fullname, 'type'=>'user'); } } diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js index eba8ac1d9..b2c8bb56d 100644 --- a/plugins/Realtime/realtimeupdate.js +++ b/plugins/Realtime/realtimeupdate.js @@ -55,7 +55,7 @@ RealtimeUpdate = { "</a> "+ "<span class=\"source\">"+ "from "+ - "<span class=\"device\">+source+</span>"++ // may have a link + "<span class=\"device\">+source+</span>"+ // may have a link "</span>"; if (data['in_reply_to_status_id']) { ni = ni+" <a class=\"response\" href=\""+data['in_reply_to_status_url']+"\">in context</a>"; |