eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Merge branch '0.8.x' of git@gitorious.org:statusnet/mainline into 0.8.x

Browse Source
This commit is contained in:
Evan Prodromou
2009-09-16 11:57:26 -04:00
parent 5ab1ec7ad5 6568a3202d
commit aef434f9b2
5 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/Autocomplete/autocomplete.php
View File

@@ -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');
}
}

2
plugins/Realtime/realtimeupdate.js
View File

@@ -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>";