Merge branch 'master' into 0.9.x

This commit is contained in:
Evan Prodromou
2010-09-01 14:21:36 -04:00
3 changed files with 69 additions and 12 deletions

View File

@@ -44,14 +44,14 @@ try {
if (empty($user)) {
throw new Exception("Can't find user with id '$id'.");
}
updateProfileURL($user);
updateOStatus($user);
} else if (have_option('n', 'nickname')) {
$nickname = get_option_value('n', 'nickname');
$user = User::staticGet('nickname', $nickname);
if (empty($user)) {
throw new Exception("Can't find user with nickname '$nickname'");
}
updateProfileURL($user);
updateOStatus($user);
} else if (have_option('a', 'all')) {
$user = new User();
if ($user->find()) {