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

diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php
index 21f6781c2dcf27a4fe4d4862b30ff7a6dcdfec57..b68a4af8eb91f0ab779c305142b552d85dede6a2 100644 (file)
--- a/classes/Memcached_DataObject.php
+++ b/classes/Memcached_DataObject.php
@@ -174,7 +174,7 @@ class Memcached_DataObject extends DB_DataObject
             $obj = $c->get(Memcached_DataObject::cacheKey($cls, $k, $v));
             if (0 == strcasecmp($cls, 'User')) {
                 // Special case for User
-                if (is_object($obj->id)) {
+                if (is_object($obj) && is_object($obj->id)) {
                     common_log(LOG_ERR, "User " . $obj->nickname . " was cached with User as ID; deleting");
                     $c->delete(Memcached_DataObject::cacheKey($cls, $k, $v));
                     return false;

diff --git a/js/util.js b/js/util.js
index 0314668d9d753117182db9b0075d02978116bf8e..43f4922749eb8e4c3f755d7957ee00fdd634b218 100644 (file)
--- a/js/util.js
+++ b/js/util.js
@@ -289,6 +289,7 @@ var SN = { // StatusNet
                             }
                         }
                         $('#'+form_id).resetForm();
+                        $('#'+form_id+' #'+SN.C.S.NoticeInReplyTo).val('');
                         $('#'+form_id+' #'+SN.C.S.NoticeDataAttachSelected).remove();
                         SN.U.FormNoticeEnhancements($('#'+form_id));
                     }

diff --git a/lib/noticeform.php b/lib/noticeform.php
index 5545d03ae98e5355daa2740e1e74850715f1fd6a..02e35a8d79bd50d16e26d6a7806499ca011c31db 100644 (file)
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -209,9 +209,9 @@ class NoticeForm extends Form
 
                 $this->out->elementStart('div', array('id' => 'notice_data-geo_wrap',
                                                       'title' => common_local_url('geocode')));
-                $this->out->checkbox('notice_data-geo', _('Share my location.'), true);
+                $this->out->checkbox('notice_data-geo', _('Share my location'), true);
                 $this->out->elementEnd('div');
-                $this->out->inlineScript(' var NoticeDataGeoShareDisable_text = "'._('Do not share my location.').'";'.
+                $this->out->inlineScript(' var NoticeDataGeoShareDisable_text = "'._('Do not share my location').'";'.
                 ' var NoticeDataGeoInfoMinimize_text = "'._('Hide this info').'";');
             }
 

diff --git a/plugins/PoweredByStatusNet/PoweredByStatusNetPlugin.php b/plugins/PoweredByStatusNet/PoweredByStatusNetPlugin.php
index bae6c529d3d62b6e9472c964defd3adc40741f8b..c59fcca8903218c45cc03910e443d3ae3bb28d58 100644 (file)
--- a/plugins/PoweredByStatusNet/PoweredByStatusNetPlugin.php
+++ b/plugins/PoweredByStatusNet/PoweredByStatusNetPlugin.php
@@ -57,7 +57,7 @@ class PoweredByStatusNetPlugin extends Plugin
     {
         $versions[] = array('name' => 'PoweredByStatusNet',
                             'version' => STATUSNET_VERSION,
-                            'author' => 'Sarven Capdaisli',
+                            'author' => 'Sarven Capadisli',
                             'homepage' => 'http://status.net/wiki/Plugin:PoweredByStatusNet',
                             'rawdescription' =>
                             _m('Outputs powered by <a href="http://status.net/">StatusNet</a> after site name.'));

diff --git a/scripts/deleteuser.php b/scripts/deleteuser.php
index 52389123c5f76f56f6b2526ad0db6271f30af843..5373c73cea59fbad5dde4283c0b600de15792816 100755 (executable)
--- a/scripts/deleteuser.php
+++ b/scripts/deleteuser.php
@@ -21,7 +21,7 @@
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
 
 $shortoptions = 'i::n::y';
-$longoptions = array('id::nickname::yes');
+$longoptions = array('id=', 'nickname=', 'yes');
 
 $helptext = <<<END_OF_DELETEUSER_HELP
 deleteuser.php [options]