diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-11-21 22:42:26 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-11-21 22:42:26 +0100 |
| commit | 9b54f2d0c49019c1ccb338ca2848b699cf2573ba (patch) | |
| tree | 920aee720970eaa59cb473885def55281342faab /phpBB/phpbb | |
| parent | 3c8d11f6cc945a695dd1abe0ac8948dadd3e46bd (diff) | |
| parent | dd7e09d0924819b0233d3ed79d837cdcfad923f0 (diff) | |
| download | forums-9b54f2d0c49019c1ccb338ca2848b699cf2573ba.tar forums-9b54f2d0c49019c1ccb338ca2848b699cf2573ba.tar.gz forums-9b54f2d0c49019c1ccb338ca2848b699cf2573ba.tar.bz2 forums-9b54f2d0c49019c1ccb338ca2848b699cf2573ba.tar.xz forums-9b54f2d0c49019c1ccb338ca2848b699cf2573ba.zip | |
Merge branch 'develop-ascraeus' into develop
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/avatar/manager.php | 40 |
1 files changed, 32 insertions, 8 deletions
diff --git a/phpBB/phpbb/avatar/manager.php b/phpBB/phpbb/avatar/manager.php index 42ae61a9a2..8d83152ed6 100644 --- a/phpBB/phpbb/avatar/manager.php +++ b/phpBB/phpbb/avatar/manager.php @@ -326,17 +326,41 @@ class manager $driver->delete($avatar_data); } - $result = self::$default_row; + $result = $this->prefix_avatar_columns($prefix, self::$default_row); - foreach ($result as $key => $value) + $sql = 'UPDATE ' . $table . ' + SET ' . $db->sql_build_array('UPDATE', $result) . ' + WHERE ' . $prefix . 'id = ' . (int) $avatar_data['id']; + $db->sql_query($sql); + + // Make sure we also delete this avatar from the users + if ($prefix === 'group_') { - $result[$prefix . $key] = $value; - unset($result[$key]); + $result = $this->prefix_avatar_columns('user_', self::$default_row); + + $sql = 'UPDATE ' . USERS_TABLE . ' + SET ' . $db->sql_build_array('UPDATE', $result) . " + WHERE user_avatar = '" . $db->sql_escape($avatar_data['avatar']) . "'"; + $db->sql_query($sql); } + } - $sql = 'UPDATE ' . $table . ' - SET ' . $db->sql_build_array('UPDATE', $result) . ' - WHERE ' . $prefix . 'id = ' . (int) $avatar_data['id']; - $db->sql_query($sql); + /** + * Prefix avatar columns + * + * @param string $prefix Column prefix + * @param array $data Column data + * + * @return array Column data with prefixed column names + */ + public function prefix_avatar_columns($prefix, $data) + { + foreach ($data as $key => $value) + { + $data[$prefix . $key] = $value; + unset($data[$key]); + } + + return $data; } } |