From 4aedce6864eb27a0c37b3dcae22fee0aa16ae537 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@prodromou.name>
Date: Wed, 18 Jun 2008 23:32:12 -0400
Subject: do some commits

darcs-hash:20080619033212-84dde-2f7227fe16c7015b03121424520ebd74d4b96762.gz
---
 actions/profilesettings.php | 10 ++++++++--
 classes/stoica.links.ini    |  0
 dataobject.ini              |  1 +
 lib/openid.php              |  8 ++++----
 4 files changed, 13 insertions(+), 6 deletions(-)
 create mode 100644 classes/stoica.links.ini

diff --git a/actions/profilesettings.php b/actions/profilesettings.php
index 44abb8e99..159dab18a 100644
--- a/actions/profilesettings.php
+++ b/actions/profilesettings.php
@@ -122,7 +122,9 @@ class ProfilesettingsAction extends SettingsAction {
 		common_debug('Updating, nickname ="'.$user->nickname.'" and email ="'.$user->email.'"');
 		common_debug('Original, nickname ="'.$original->nickname.'" and email ="'.$original->email.'"');
 		
-		if (FALSE === $user->update($original)) {
+		$result = $user->update($original);
+		
+		if (!$result) {
 			common_server_error(_t('Couldnt update user.'));
 			return;
 		}
@@ -138,12 +140,16 @@ class ProfilesettingsAction extends SettingsAction {
 		$profile->location = $location;
 		$profile->profileurl = common_profile_url($nickname);
 
-		if (FALSE === $profile->update($orig_profile)) {
+		$result = $profile->update($orig_profile);
+		
+		if (!$result) {
 			common_server_error(_t('Couldnt save profile.'));
 			return;
 		}
 
 		common_broadcast_profile($profile);
+
+		$user->query('COMMIT');
 		
 		$this->show_form(_t('Settings saved.'), TRUE);
 	}
diff --git a/classes/stoica.links.ini b/classes/stoica.links.ini
new file mode 100644
index 000000000..e69de29bb
diff --git a/dataobject.ini b/dataobject.ini
index ec5843e74..0a8a19833 100644
--- a/dataobject.ini
+++ b/dataobject.ini
@@ -8,3 +8,4 @@ class_prefix      =
 db_driver         = DB #Use this if you wish to use MDB2 as the driver
 quote_identifiers = 0
 generator_exclude_regex = /oid_.*/
+generate_links	  = 1
diff --git a/lib/openid.php b/lib/openid.php
index 74d7d64a9..f5f98201d 100644
--- a/lib/openid.php
+++ b/lib/openid.php
@@ -51,15 +51,15 @@ function oid_link_user($id, $canonical, $display) {
 	$oid->display = $display;
 	$oid->created = DB_DataObject_Cast::dateTime();
 
-    common_debug('oid = '.print_r($oid, TRUE), __FILE__);
-	
 	if (!$oid->insert()) {
 		$err = PEAR::getStaticProperty('DB_DataObject','lastError');
 		common_debug('DB error ' . $err->code . ': ' . $err->message, __FILE__);
 		return false;
 	}
-
-    common_debug('oid = '.print_r($oid, TRUE), __FILE__);
+	
+	# For some reason, autocommit is turned off
+	
+	$oid->query('COMMIT');
 	
 	return true;
 }
-- 
cgit v1.2.3