wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Zach Copley 2010-01-11 23:22:24 +00:00
commit 91b9c13d15
2 changed files with 2 additions and 2 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)); $obj = $c->get(Memcached_DataObject::cacheKey($cls, $k, $v));
if (0 == strcasecmp($cls, 'User')) { if (0 == strcasecmp($cls, 'User')) {
// Special case for 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"); common_log(LOG_ERR, "User " . $obj->nickname . " was cached with User as ID; deleting");
$c->delete(Memcached_DataObject::cacheKey($cls, $k, $v)); $c->delete(Memcached_DataObject::cacheKey($cls, $k, $v));
return false; return false;

2
scripts/deleteuser.php
View File

@ -21,7 +21,7 @@
define('INSTALLDIR', realpath(dirname(__FILE__) . '/..')); define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
$shortoptions = 'i::n::y'; $shortoptions = 'i::n::y';
$longoptions = array('id::nickname::yes'); $longoptions = array('id=', 'nickname=', 'yes');
$helptext = <<<END_OF_DELETEUSER_HELP $helptext = <<<END_OF_DELETEUSER_HELP
deleteuser.php [options] deleteuser.php [options]