Merge branch '3.2.x'

This commit is contained in:
Marc Alexander 2016-08-01 20:42:16 +02:00
commit da15d435bf

View file

@ -119,19 +119,29 @@ function user_update_name($old_name, $new_name)
global $config, $db, $cache, $phpbb_dispatcher; global $config, $db, $cache, $phpbb_dispatcher;
$update_ary = array( $update_ary = array(
FORUMS_TABLE => array('forum_last_poster_name'), FORUMS_TABLE => array(
MODERATOR_CACHE_TABLE => array('username'), 'forum_last_poster_id' => 'forum_last_poster_name',
POSTS_TABLE => array('post_username'), ),
TOPICS_TABLE => array('topic_first_poster_name', 'topic_last_poster_name'), MODERATOR_CACHE_TABLE => array(
'user_id' => 'username',
),
POSTS_TABLE => array(
'poster_id' => 'post_username',
),
TOPICS_TABLE => array(
'topic_poster' => 'topic_first_poster_name',
'topic_last_poster_id' => 'topic_last_poster_name',
),
); );
foreach ($update_ary as $table => $field_ary) foreach ($update_ary as $table => $field_ary)
{ {
foreach ($field_ary as $field) foreach ($field_ary as $id_field => $name_field)
{ {
$sql = "UPDATE $table $sql = "UPDATE $table
SET $field = '" . $db->sql_escape($new_name) . "' SET $name_field = '" . $db->sql_escape($new_name) . "'
WHERE $field = '" . $db->sql_escape($old_name) . "'"; WHERE $name_field = '" . $db->sql_escape($old_name) . "'
AND $id_field <> " . ANONYMOUS;
$db->sql_query($sql); $db->sql_query($sql);
} }
} }