From 7ff02bb7d4483b3dc24edd78551a3936798056a8 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Fri, 26 Sep 2008 10:50:08 -0400
Subject: try to clean up user-without-profile errors

darcs-hash:20080926145008-5ed1f-8a60ed3c5adbfe75aa044732e8d10dbdb9b93089.gz
---
 actions/profilesettings.php | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'actions/profilesettings.php')

diff --git a/actions/profilesettings.php b/actions/profilesettings.php
index 0474c6937..e5698011a 100644
--- a/actions/profilesettings.php
+++ b/actions/profilesettings.php
@@ -110,6 +110,12 @@ class ProfilesettingsAction extends SettingsAction {
 		$user = common_current_user();
 		$profile = $user->getProfile();
 
+		if (!$profile) {
+			common_log_db_error($user, 'SELECT', __FILE__);
+			$this->server_error(_('User without matching profile'));
+			return;
+		}
+		
 		$original = $profile->getOriginalAvatar();
 
 
-- 
cgit v1.2.3-54-g00ecf