summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--actions/profilesettings.php10
-rw-r--r--classes/stoica.links.ini0
-rw-r--r--dataobject.ini1
-rw-r--r--lib/openid.php8
4 files changed, 13 insertions, 6 deletions
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
--- /dev/null
+++ b/classes/stoica.links.ini
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;
}