From 24379f1297d092141f04ccb55013e85e9b494a83 Mon Sep 17 00:00:00 2001
From: Cullen Walsh <ckwalsh@phpbb.com>
Date: Sun, 17 Apr 2011 20:11:36 -0700
Subject: [feature/avatars] Rename gallery avatar driver

Renaming gallery avatar driver to better work with existing config options.

PHPBB3-10018
---
 phpBB/includes/avatar/driver/gallery.php | 50 --------------------------------
 phpBB/includes/avatar/driver/local.php   | 50 ++++++++++++++++++++++++++++++++
 phpBB/includes/avatar/driver/upload.php  |  2 +-
 3 files changed, 51 insertions(+), 51 deletions(-)
 delete mode 100644 phpBB/includes/avatar/driver/gallery.php
 create mode 100644 phpBB/includes/avatar/driver/local.php

diff --git a/phpBB/includes/avatar/driver/gallery.php b/phpBB/includes/avatar/driver/gallery.php
deleted file mode 100644
index b937332b2d..0000000000
--- a/phpBB/includes/avatar/driver/gallery.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/**
-*
-* @package avatar
-* @copyright (c) 2005, 2009 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Handles avatars selected from the board gallery
-* @package avatars
-*/
-class phpbb_avatar_driver_gallery extends phpbb_avatar_driver
-{
-	/**
-	* Get the avatar url and dimensions
-	*
-	* @param $ignore_config Whether $user or global avatar visibility settings
-	*        should be ignored
-	* @return array Avatar data
-	*/
-	public function get_data($user_row, $ignore_config = false)
-	{
-		if ($ignore_config || $this->config['allow_avatar_local'])
-		{
-			return array(
-				'src' => $this->phpbb_root_path . $this->config['avatar_gallery_path'] . '/' . $user_row['user_avatar'],
-				'width' => $user_row['user_avatar_width'],
-				'height' => $user_row['user_avatar_height'],
-			);
-		}
-		else
-		{
-			return array(
-				'src' => '',
-				'width' => 0,
-				'height' => 0,
-			);
-		}
-	}
-}
diff --git a/phpBB/includes/avatar/driver/local.php b/phpBB/includes/avatar/driver/local.php
new file mode 100644
index 0000000000..4014f29cbe
--- /dev/null
+++ b/phpBB/includes/avatar/driver/local.php
@@ -0,0 +1,50 @@
+<?php
+/**
+*
+* @package avatar
+* @copyright (c) 2005, 2009 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Handles avatars selected from the board gallery
+* @package avatars
+*/
+class phpbb_avatar_driver_local extends phpbb_avatar_driver
+{
+	/**
+	* Get the avatar url and dimensions
+	*
+	* @param $ignore_config Whether $user or global avatar visibility settings
+	*        should be ignored
+	* @return array Avatar data
+	*/
+	public function get_data($user_row, $ignore_config = false)
+	{
+		if ($ignore_config || $this->config['allow_avatar_local'])
+		{
+			return array(
+				'src' => $this->phpbb_root_path . $this->config['avatar_gallery_path'] . '/' . $user_row['user_avatar'],
+				'width' => $user_row['user_avatar_width'],
+				'height' => $user_row['user_avatar_height'],
+			);
+		}
+		else
+		{
+			return array(
+				'src' => '',
+				'width' => 0,
+				'height' => 0,
+			);
+		}
+	}
+}
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'],
-- 
cgit v1.2.1