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

diff --git a/classes/Profile.php b/classes/Profile.php
index c4fb3a5439f002a8193ec00a87188ce6f0eb0374..6ad0e7a3a3b3f3884fbe221466cb034938550551 100644 (file)
--- 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 f590d1b97a7fa2cd83017b309688e372b37c99d3..2657763f440ba59b9ef45312ab97c81f084a66e2 100644 (file)
--- 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 06cdbdfe0f70685b212df21b40cba962dd5bb8a4..ebef4f9e4399d5db186f9d988aeee057b10a07bb 100644 (file)
--- 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 96d54af8d1d40a8f91d9a4c0ffc50b12b43af29b..4379a86f28c64470d4f2b21b587e5334e56d394c 100644 (file)
--- 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 eba8ac1d9144e274ba04d9c3db7d0cef61185400..b2c8bb56d665bd583ccd1d472e5cd9b1976b3f25 100644 (file)
--- 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>";