X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fname.func.inc.php;h=7fd7623e5149faec334f5a4c7587ac042bc12e0e;hb=16d2c88314364b5e79936f4262d453dff03abdad;hp=d9542635c48b4eadc1a0a03e7b85abdd416dea60;hpb=f74509fbb4f06820dc3d028e3ffd2145f151b013;p=platal.git diff --git a/include/name.func.inc.php b/include/name.func.inc.php index d954263..7fd7623 100644 --- a/include/name.func.inc.php +++ b/include/name.func.inc.php @@ -252,18 +252,12 @@ function set_alias_names(&$sn_new, $sn_old, $pid, $uid, $update_new = false, $ne $has_new = false; foreach ($sn_new as $typeid => $sn) { if (isset($sn['pub'])) { - if (isset($sn_old[$typeid]) && ($sn_old[$typeid]['fullname'] == $sn['fullname'] && $update_new)) { + if (isset($sn_old[$typeid]) && $update_new) { XDB::execute("UPDATE profile_name SET particle = {?}, name = {?}, typeid = {?} WHERE id = {?} AND pid = {?}", $sn['particle'], $sn['name'], $typeid, $sn_old[$typeid]['id'], $pid); unset($sn_old[$typeid]); - } elseif ($update_new - || (isset($sn_old[$typeid]) && compare_basename($sn_old[$typeid]['fullname'], $sn['fullname']))) { - XDB::execute("INSERT INTO profile_name (particle, name, typeid, pid) - VALUES ({?}, {?}, {?}, {?})", - $sn['particle'], $sn['name'], $typeid, $pid); - unset($sn_old[$typeid]); } else { $has_new = true; } @@ -308,7 +302,7 @@ function set_alias_names(&$sn_new, $sn_old, $pid, $uid, $update_new = false, $ne VALUES ({?}, 'alias', 'usage', {?})", $new_alias, $uid); } - Profile::rebuildSearchTokens($pid); + Profile::rebuildSearchTokens($pid, false); return $has_new; }