aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCullen Walsh <ckwalsh@phpbb.com>2011-06-15 12:38:17 -0700
committerCullen Walsh <ckwalsh@cullenwalsh.com>2012-03-18 22:20:45 +0000
commit6d0f2e478800e1e9696701eeff00ac69c1e57dee (patch)
tree52b9e78eeb3f7c03d22b09cc8edffa77f3bc1673
parent84099e5bc1f452e1a4643fd78658929875ab1eee (diff)
downloadforums-6d0f2e478800e1e9696701eeff00ac69c1e57dee.tar
forums-6d0f2e478800e1e9696701eeff00ac69c1e57dee.tar.gz
forums-6d0f2e478800e1e9696701eeff00ac69c1e57dee.tar.bz2
forums-6d0f2e478800e1e9696701eeff00ac69c1e57dee.tar.xz
forums-6d0f2e478800e1e9696701eeff00ac69c1e57dee.zip
[feature/avatars] Fixing typos in avatar manager and local avatars
See above PHPBB3-10018
-rw-r--r--phpBB/includes/avatar/driver/local.php2
-rw-r--r--phpBB/includes/avatar/manager.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/avatar/driver/local.php b/phpBB/includes/avatar/driver/local.php
index 47ae143ec9..216ad2ce46 100644
--- a/phpBB/includes/avatar/driver/local.php
+++ b/phpBB/includes/avatar/driver/local.php
@@ -70,7 +70,7 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
foreach ($avatar_list[$category] as $img => $data)
{
$template->assign_block_vars('av_local_imgs', array(
- 'AVATAR_IMAGE' => $path . '/' . $data['file'],
+ 'AVATAR_IMAGE' => $this->phpbb_root_path . $this->config['avatar_gallery_path'] . '/' . $data['file'],
'AVATAR_NAME' => $data['name'],
'AVATAR_FILE' => $data['filename'],
));
diff --git a/phpBB/includes/avatar/manager.php b/phpBB/includes/avatar/manager.php
index 7137243898..001fcf2f14 100644
--- a/phpBB/includes/avatar/manager.php
+++ b/phpBB/includes/avatar/manager.php
@@ -50,7 +50,7 @@ class phpbb_avatar_manager
// Legacy stuff...
switch ($avatar_type)
{
- case AVATAR_LOCAL:
+ case AVATAR_GALLERY:
$avatar_type = 'local';
break;
case AVATAR_UPLOAD: