summaryrefslogtreecommitdiff
path: root/actions/twittersettings.php
diff options
context:
space:
mode:
Diffstat (limited to 'actions/twittersettings.php')
-rw-r--r--actions/twittersettings.php11
1 files changed, 9 insertions, 2 deletions
diff --git a/actions/twittersettings.php b/actions/twittersettings.php
index d8eb7aba0..d37c042ac 100644
--- a/actions/twittersettings.php
+++ b/actions/twittersettings.php
@@ -238,6 +238,10 @@ class TwittersettingsAction extends SettingsAction {
return;
}
+ $flink->query('BEGIN');
+
+ $original = clone($flink);
+
if ($noticesync) {
if ($replysync) {
$flink->noticesync = 3;
@@ -250,14 +254,17 @@ class TwittersettingsAction extends SettingsAction {
$flink->friendsync = ($friendsync) ? 2 : 0;
// $flink->profilesync = 0; // XXX: leave as default?
- $result = $flink->update();
- if (!$result) {
+ $result = $flink->update($original);
+
+ if ($result === FALSE) {
common_log_db_error($flink, 'UPDATE', __FILE__);
$this->show_form(_('Couldn\'t save Twitter preferences.'));
return;
}
+ $flink->query('COMMIT');
+
$this->show_form(_('Twitter preferences saved.'));
return;