From aaea2b1a967fdc884f9ba6627906f847332e0184 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Mon, 11 Jan 2010 13:02:04 +0100 Subject: [PATCH 1/5] Apparently, I can't spell my family name. --- plugins/PoweredByStatusNet/PoweredByStatusNetPlugin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/PoweredByStatusNet/PoweredByStatusNetPlugin.php b/plugins/PoweredByStatusNet/PoweredByStatusNetPlugin.php index bae6c529d3..c59fcca890 100644 --- 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 StatusNet after site name.')); From 70bdaeeb09ba766d5d8fd84d7f5b56a61eb8cc8a Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Mon, 11 Jan 2010 12:19:53 +0000 Subject: [PATCH 2/5] Explicitly reseting notice_in-reply-to value --- js/util.js | 1 + 1 file changed, 1 insertion(+) diff --git a/js/util.js b/js/util.js index 0314668d9d..43f4922749 100644 --- 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)); } From c7b768b4c853693c997b5b47c1fa83c22ecdffdf Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Mon, 11 Jan 2010 16:33:46 +0100 Subject: [PATCH 3/5] Removed period --- lib/noticeform.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/noticeform.php b/lib/noticeform.php index 5545d03ae9..02e35a8d79 100644 --- 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').'";'); } From be1ac6678de2534e1ec42c4dc779fec240d1ebd7 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 11 Jan 2010 13:24:40 -0800 Subject: [PATCH 4/5] fix long options on deleteuser.php --- scripts/deleteuser.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/deleteuser.php b/scripts/deleteuser.php index 52389123c5..5373c73cea 100755 --- 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 = << Date: Mon, 11 Jan 2010 13:24:52 -0800 Subject: [PATCH 5/5] Regression fix: don't spew notices to log every time we get a non-cached user object --- classes/Memcached_DataObject.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php index 21f6781c2d..b68a4af8eb 100644 --- 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;