aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCullen Walsh <ckwalsh@phpbb.com>2011-04-17 20:11:36 -0700
committerCullen Walsh <ckwalsh@cullenwalsh.com>2012-03-18 22:19:16 +0000
commit24379f1297d092141f04ccb55013e85e9b494a83 (patch)
tree8a1d3c32604850645df79f14e86ff46bd6a73ba1
parent16bb0f00b79102aed7da984cbca8a4b1741c62af (diff)
downloadforums-24379f1297d092141f04ccb55013e85e9b494a83.tar
forums-24379f1297d092141f04ccb55013e85e9b494a83.tar.gz
forums-24379f1297d092141f04ccb55013e85e9b494a83.tar.bz2
forums-24379f1297d092141f04ccb55013e85e9b494a83.tar.xz
forums-24379f1297d092141f04ccb55013e85e9b494a83.zip
[feature/avatars] Rename gallery avatar driver
Renaming gallery avatar driver to better work with existing config options. PHPBB3-10018
-rw-r--r--phpBB/includes/avatar/driver/local.php (renamed from phpBB/includes/avatar/driver/gallery.php)2
-rw-r--r--phpBB/includes/avatar/driver/upload.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/avatar/driver/gallery.php b/phpBB/includes/avatar/driver/local.php
index b937332b2d..4014f29cbe 100644
--- a/phpBB/includes/avatar/driver/gallery.php
+++ b/phpBB/includes/avatar/driver/local.php
@@ -19,7 +19,7 @@ if (!defined('IN_PHPBB'))
* Handles avatars selected from the board gallery
* @package avatars
*/
-class phpbb_avatar_driver_gallery extends phpbb_avatar_driver
+class phpbb_avatar_driver_local extends phpbb_avatar_driver
{
/**
* Get the avatar url and dimensions
diff --git a/phpBB/includes/avatar/driver/upload.php b/phpBB/includes/avatar/driver/upload.php
index 777c9c2060..da12d52d40 100644
--- a/phpBB/includes/avatar/driver/upload.php
+++ b/phpBB/includes/avatar/driver/upload.php
@@ -30,7 +30,7 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver
*/
public function get_data($user_row, $ignore_config = false)
{
- if (ignore_config || $this->config['allow_avatar_upload'])
+ if ($ignore_config || $this->config['allow_avatar_upload'])
{
return array(
'src' => $this->phpbb_root_path . 'download/file.' . $this->php_ext . '?avatar=' . $user_row['user_avatar'],