diff options
| -rw-r--r-- | classes/Memcached_DataObject.php | 2 | ||||
| -rw-r--r-- | js/util.js | 1 | ||||
| -rw-r--r-- | lib/noticeform.php | 4 | ||||
| -rw-r--r-- | plugins/PoweredByStatusNet/PoweredByStatusNetPlugin.php | 2 | ||||
| -rwxr-xr-x | scripts/deleteuser.php | 2 |
5 files changed, 6 insertions, 5 deletions
diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php index 21f6781c2..b68a4af8e 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; diff --git a/js/util.js b/js/util.js index 0314668d9..43f492274 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)); } diff --git a/lib/noticeform.php b/lib/noticeform.php index 5545d03ae..02e35a8d7 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').'";'); } diff --git a/plugins/PoweredByStatusNet/PoweredByStatusNetPlugin.php b/plugins/PoweredByStatusNet/PoweredByStatusNetPlugin.php index bae6c529d..c59fcca89 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 <a href="http://status.net/">StatusNet</a> after site name.')); diff --git a/scripts/deleteuser.php b/scripts/deleteuser.php index 52389123c..5373c73ce 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 = <<<END_OF_DELETEUSER_HELP deleteuser.php [options] |