GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

strcmp for comparison 

darcs-hash:20080622153220-34904-119cea6c5dbe20e33569287cf9632c07e9768b10.gz
This commit is contained in:
Evan Prodromou 2008-06-22 11:32:20 -04:00
parent 7bf88079a9
commit 1cab6c7d50
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
actions/profilesettings.php
View File

@ -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

2
classes/User.php
View File

@ -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);
}
}