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 | |
| parent | 5ab1ec7ad578e1ac1f2d18ad8e2299cda21f572a (diff) | |
| parent | 6568a3202d3acfde694b359e2524d52d93dc83dd (diff) | |
Merge branch '0.8.x' of git@gitorious.org:statusnet/mainline into 0.8.x
| -rw-r--r-- | classes/Profile.php | 5 | ||||
| -rw-r--r-- | db/notice_source.sql | 1 | ||||
| -rw-r--r-- | lib/action.php | 2 | ||||
| -rw-r--r-- | plugins/Autocomplete/autocomplete.php | 2 | ||||
| -rw-r--r-- | plugins/Realtime/realtimeupdate.js | 2 |
5 files changed, 3 insertions, 9 deletions
diff --git a/classes/Profile.php b/classes/Profile.php index c4fb3a543..6ad0e7a3a 100644 --- a/classes/Profile.php +++ b/classes/Profile.php @@ -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)) { diff --git a/db/notice_source.sql b/db/notice_source.sql index f590d1b97..2657763f4 100644 --- a/db/notice_source.sql +++ b/db/notice_source.sql @@ -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()), diff --git a/lib/action.php b/lib/action.php index 06cdbdfe0..ebef4f9e4 100644 --- a/lib/action.php +++ b/lib/action.php @@ -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); } 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>"; |