do some commits

darcs-hash:20080619033212-84dde-2f7227fe16c7015b03121424520ebd74d4b96762.gz

diff --git a/actions/profilesettings.php b/actions/profilesettings.php
index 44abb8e99cf19c4451c7b898b5288211dc6fe30f..159dab18a91015fb27d4e7be0b544b3ab9609b3e 100644 (file)
--- 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 (file)
index 0000000..e69de29

diff --git a/dataobject.ini b/dataobject.ini
index ec5843e74f04cbd773fcacab60866ada1469dd2e..0a8a1983364f3d4ada8d0f5dca64e5a72c7c681b 100644 (file)
--- 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 74d7d64a9d2adfa922bb34ad9462022a23774952..f5f98201d34e7a521e3f3c6dd8e2961cf4cd8a70 100644 (file)
--- 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;
 }