Merge branch 'master' of git@github.com:gallery/gallery3

This commit is contained in:
Tim Almdal 2009-10-31 09:42:25 -07:00
commit 61216b7205

View File

@ -28,6 +28,7 @@ class Log_Model extends ORM {
try {
return identity::lookup_user($this->user_id);
} catch (Exception $e) {
Kohana::log("alert", "Unable to load user with id $this->user_id");
return null;
}
} else {