Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
This commit is contained in:
commit
91b9c13d15
|
@ -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;
|
||||
|
|
|
@ -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]
|
||||
|
|
Loading…
Reference in New Issue
Block a user