GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

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

This commit is contained in:
Evan Prodromou 2010-01-11 15:12:13 -08:00
parent 6ef70bf5d9 f397d35527
commit 57ac912519
5 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/Memcached_DataObject.php
View File

@ -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;

1
js/util.js
View File

@ -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));
}

4
lib/noticeform.php
View File

@ -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').'";');
}

2
plugins/PoweredByStatusNet/PoweredByStatusNetPlugin.php
View File

@ -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.'));

2
scripts/deleteuser.php
View File

@ -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]