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
commit aef434f9b2
5 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
classes/Profile.php
View File

@ -47,11 +47,6 @@ class Profile extends Memcached_DataObject
/* the code above is auto generated do not remove the tag below */ /* the code above is auto generated do not remove the tag below */
###END_AUTOCODE ###END_AUTOCODE
function &pkeyGet($kv)
{
return Memcached_DataObject::pkeyGet('Profile', $kv);
}
function getAvatar($width, $height=null) function getAvatar($width, $height=null)
{ {
if (is_null($height)) { if (is_null($height)) {

1
db/notice_source.sql
View File

@ -21,6 +21,7 @@ VALUES
('identichat','identichat','http://identichat.prosody.im/', now()), ('identichat','identichat','http://identichat.prosody.im/', now()),
('IdentiFox','IdentiFox','http://www.bitbucket.org/uncryptic/identifox/', now()), ('IdentiFox','IdentiFox','http://www.bitbucket.org/uncryptic/identifox/', now()),
('identitwitch','IdentiTwitch','http://richfish.org/identitwitch/', now()), ('identitwitch','IdentiTwitch','http://richfish.org/identitwitch/', now()),
('Jiminy','Jiminy','http://code.google.com/p/jiminy/', now()),
('LaTwit','LaTwit','http://latwit.mac65.com/', 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()),
('livetweeter', 'livetweeter', 'http://addons.songbirdnest.com/addon/1204', now()), ('livetweeter', 'livetweeter', 'http://addons.songbirdnest.com/addon/1204', now()),

2
lib/action.php
View File

@ -900,7 +900,6 @@ class Action extends HTMLOutputter // lawsuit
!$etag || !$etag ||
$this->_hasEtag($etag, $if_none_match)) { $this->_hasEtag($etag, $if_none_match)) {
header('HTTP/1.1 304 Not Modified'); header('HTTP/1.1 304 Not Modified');
header('Content-Length: 0');
// Better way to do this? // Better way to do this?
exit(0); exit(0);
} }
@ -919,7 +918,6 @@ class Action extends HTMLOutputter // lawsuit
header('ETag: ' . $etag); header('ETag: ' . $etag);
if($if_none_match && $this->_hasEtag($etag, $if_none_match)) { if($if_none_match && $this->_hasEtag($etag, $if_none_match)) {
header('HTTP/1.1 304 Not Modified'); header('HTTP/1.1 304 Not Modified');
header('Content-Length: 0');
// Better way to do this? // Better way to do this?
exit(0); exit(0);
} }

2
plugins/Autocomplete/autocomplete.php
View File

@ -62,7 +62,7 @@ class AutocompleteAction extends Action
$user->whereAdd('nickname like \'' . trim($user->escape($q), '\'') . '%\''); $user->whereAdd('nickname like \'' . trim($user->escape($q), '\'') . '%\'');
$user->find(); $user->find();
while($user->fetch()) { 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'); $this->results[]=array('nickname' => $user->nickname, 'fullname'=> $profile->fullname, 'type'=>'user');
} }
} }

2
plugins/Realtime/realtimeupdate.js
View File

@ -55,7 +55,7 @@ RealtimeUpdate = {
"</a> "+ "</a> "+
"<span class=\"source\">"+ "<span class=\"source\">"+
"from "+ "from "+
"<span class=\"device\">+source+</span>"++ // may have a link "<span class=\"device\">+source+</span>"+ // may have a link
"</span>"; "</span>";
if (data['in_reply_to_status_id']) { if (data['in_reply_to_status_id']) {
ni = ni+" <a class=\"response\" href=\""+data['in_reply_to_status_url']+"\">in context</a>"; ni = ni+" <a class=\"response\" href=\""+data['in_reply_to_status_url']+"\">in context</a>";