summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlezvous.ca>2008-06-22 11:32:20 -0400
committerEvan Prodromou <evan@controlezvous.ca>2008-06-22 11:32:20 -0400
commit1cab6c7d5043ce60469b9590aeb846034d575335 (patch)
tree063b5d7927f7578aec8a0db2f5e2a6a2507f3eb6
parent7bf88079a9bade4570f75f1b41479d2dcccf24ca (diff)
strcmp for comparison
darcs-hash:20080622153220-34904-119cea6c5dbe20e33569287cf9632c07e9768b10.gz
-rw-r--r--actions/profilesettings.php20
-rw-r--r--classes/User.php2
2 files changed, 12 insertions, 10 deletions
diff --git a/actions/profilesettings.php b/actions/profilesettings.php
index 30dbd89ec..b23a43f87 100644
--- a/actions/profilesettings.php
+++ b/actions/profilesettings.php
@@ -114,21 +114,23 @@ class ProfilesettingsAction extends SettingsAction {
$user->query('BEGIN');
- $original = clone($user);
+ if (strcmp($user->nickname, $nickname) != 0) {
+ $original = clone($user);
- $user->nickname = $nickname;
+ $user->nickname = $nickname;
- common_debug('Old nickname = ' . $original->nickname . ', new nickname = ' . $user->nickname, __FILE__);
+ common_debug('Old nickname = ' . $original->nickname . ', new nickname = ' . $user->nickname, __FILE__);
- $result = $user->updateKeys($original);
+ $result = $user->updateKeys($original);
- if ($result === FALSE) {
- common_log_db_error($user, 'UPDATE', __FILE__);
- common_server_error(_t('Couldnt update user.'));
- return;
+ if ($result === FALSE) {
+ common_log_db_error($user, 'UPDATE', __FILE__);
+ common_server_error(_t('Couldnt update user.'));
+ return;
+ }
}
- if ($user->email != $email) {
+ if (strcmp($user->email, $email) != 0) {
# We don't update email directly; it gets done by confirmemail
diff --git a/classes/User.php b/classes/User.php
index 94240392e..4fb6892ea 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -67,7 +67,7 @@ class User extends DB_DataObject
function updateKeys(&$orig) {
$parts = array();
foreach (array('nickname', 'email') as $k) {
- if ($this->$k != $orig->$k) {
+ if (strcmp($this->$k, $orig->$k) != 0) {
$parts[] = $k . ' = ' . $this->_quote($this->$k);
}
}