Commit aef434f9 authored by Evan Prodromou's avatar Evan Prodromou

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

parents 5ab1ec7a 6568a320
......@@ -47,11 +47,6 @@ class Profile extends Memcached_DataObject
/* the code above is auto generated do not remove the tag below */
###END_AUTOCODE
function &pkeyGet($kv)
{
return Memcached_DataObject::pkeyGet('Profile', $kv);
}
function getAvatar($width, $height=null)
{
if (is_null($height)) {
......
......@@ -21,6 +21,7 @@ VALUES
('identichat','identichat','http://identichat.prosody.im/', now()),
('IdentiFox','IdentiFox','http://www.bitbucket.org/uncryptic/identifox/', now()),
('identitwitch','IdentiTwitch','http://richfish.org/identitwitch/', now()),
('Jiminy','Jiminy','http://code.google.com/p/jiminy/', now()),
('LaTwit','LaTwit','http://latwit.mac65.com/', now()),
('LiveTweeter', 'LiveTweeter', 'http://addons.songbirdnest.com/addon/1204', now()),
('livetweeter', 'livetweeter', 'http://addons.songbirdnest.com/addon/1204', now()),
......
......@@ -900,7 +900,6 @@ class Action extends HTMLOutputter // lawsuit
!$etag ||
$this->_hasEtag($etag, $if_none_match)) {
header('HTTP/1.1 304 Not Modified');
header('Content-Length: 0');
// Better way to do this?
exit(0);
}
......@@ -919,7 +918,6 @@ class Action extends HTMLOutputter // lawsuit
header('ETag: ' . $etag);
if($if_none_match && $this->_hasEtag($etag, $if_none_match)) {
header('HTTP/1.1 304 Not Modified');
header('Content-Length: 0');
// Better way to do this?
exit(0);
}
......
......@@ -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');
}
}
......
......@@ -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>";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment