7 files changed, 28 insertions, 28 deletions
diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index fe65ea2f03..eeeefe03ba 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -290,7 +290,7 @@ class acp_groups
 				if ($config['allow_avatar'])
 				{
 					$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
-					$avatar_drivers = $phpbb_avatar_manager->get_valid_drivers();
+					$avatar_drivers = $phpbb_avatar_manager->get_enabled_drivers();
 
 					// This is normalised data, without the group_ prefix
 					$avatar_data = phpbb_avatar_manager::clean_row($group_row);
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index b2ef43edbe..0c29eb658f 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -1737,7 +1737,7 @@ class acp_users
 				if ($config['allow_avatar'])
 				{
 					$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
-					$avatar_drivers = $phpbb_avatar_manager->get_valid_drivers();
+					$avatar_drivers = $phpbb_avatar_manager->get_enabled_drivers();
 
 					// This is normalised data, without the user_ prefix
 					$avatar_data = phpbb_avatar_manager::clean_row($user_row);
diff --git a/phpBB/includes/avatar/driver/remote.php b/phpBB/includes/avatar/driver/remote.php
index 1f16fce1e7..717b73eb0c 100644
--- a/phpBB/includes/avatar/driver/remote.php
+++ b/phpBB/includes/avatar/driver/remote.php
@@ -117,7 +117,7 @@ class phpbb_avatar_driver_remote extends phpbb_avatar_driver
 
 		if (!class_exists('fileupload'))
 		{
-			include_once($this->phpbb_root_path . 'includes/functions_upload' . $this->php_ext);
+			include($this->phpbb_root_path . 'includes/functions_upload' . $this->php_ext);
 		}
 
 		$types = fileupload::image_types();
diff --git a/phpBB/includes/avatar/driver/upload.php b/phpBB/includes/avatar/driver/upload.php
index 38627baacf..4facb243ac 100644
--- a/phpBB/includes/avatar/driver/upload.php
+++ b/phpBB/includes/avatar/driver/upload.php
@@ -63,7 +63,7 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver
 
 		if (!class_exists('fileupload'))
 		{
-			include_once($this->phpbb_root_path . 'includes/functions_upload' . $this->php_ext);
+			include($this->phpbb_root_path . 'includes/functions_upload' . $this->php_ext);
 		}
 
 		$upload = new fileupload('AVATAR_', array('jpg', 'jpeg', 'gif', 'png'), $this->config['avatar_filesize'], $this->config['avatar_min_width'], $this->config['avatar_min_height'], $this->config['avatar_max_width'], $this->config['avatar_max_height'], (isset($this->config['mime_triggers']) ? explode('|', $this->config['mime_triggers']) : false));
diff --git a/phpBB/includes/avatar/manager.php b/phpBB/includes/avatar/manager.php
index f5c93a6328..cbc9c4a485 100644
--- a/phpBB/includes/avatar/manager.php
+++ b/phpBB/includes/avatar/manager.php
@@ -21,7 +21,7 @@ if (!defined('IN_PHPBB'))
 class phpbb_avatar_manager
 {
 	protected $config;
-	protected static $valid_drivers = false;
+	static protected $enabled_drivers = false;
 	protected $avatar_drivers;
 	protected $container;
 
@@ -47,18 +47,18 @@ class phpbb_avatar_manager
 	* Get the driver object specified by the avatar type
 	*
 	* @param string $avatar_type Avatar type; by default an avatar's service container name
-	* @param bool $load_valid Load only valid avatars
+	* @param bool $load_enabled Load only enabled avatars
 	*
 	* @return object Avatar driver object
 	*/
-	public function get_driver($avatar_type, $load_valid = true)
+	public function get_driver($avatar_type, $load_enabled = true)
 	{
-		if (self::$valid_drivers === false)
+		if (self::$enabled_drivers === false)
 		{
-			$this->load_valid_drivers();
+			$this->load_enabled_drivers();
 		}
 
-		$avatar_drivers = ($load_valid) ? self::$valid_drivers : $this->get_all_drivers();
+		$avatar_drivers = ($load_enabled) ? self::$enabled_drivers : $this->get_all_drivers();
 
 		// Legacy stuff...
 		switch ($avatar_type)
@@ -89,22 +89,22 @@ class phpbb_avatar_manager
 	}
 
 	/**
-	* Load the list of valid drivers
-	* This is executed once and fills self::$valid_drivers
+	* Load the list of enabled drivers
+	* This is executed once and fills self::$enabled_drivers
 	*/
-	protected function load_valid_drivers()
+	protected function load_enabled_drivers()
 	{
 		if (!empty($this->avatar_drivers))
 		{
-			self::$valid_drivers = array();
+			self::$enabled_drivers = array();
 			foreach ($this->avatar_drivers as $driver)
 			{
 				if ($this->is_enabled($driver))
 				{
-					self::$valid_drivers[$driver->get_name()] = $driver->get_name();
+					self::$enabled_drivers[$driver->get_name()] = $driver->get_name();
 				}
 			}
-			asort(self::$valid_drivers);
+			asort(self::$enabled_drivers);
 		}
 	}
 
@@ -130,18 +130,18 @@ class phpbb_avatar_manager
 	}
 
 	/**
-	* Get a list of valid avatar drivers
+	* Get a list of enabled avatar drivers
 	*
-	* @return array Array containing a list of the valid avatar drivers
+	* @return array Array containing a list of the enabled avatar drivers
 	*/
-	public function get_valid_drivers()
+	public function get_enabled_drivers()
 	{
-		if (self::$valid_drivers === false)
+		if (self::$enabled_drivers === false)
 		{
-			$this->load_valid_drivers();
+			$this->load_enabled_drivers();
 		}
 
-		return self::$valid_drivers;
+		return self::$enabled_drivers;
 	}
 
 	/**
@@ -152,7 +152,7 @@ class phpbb_avatar_manager
 	* @return array User data or group data with keys that have been
 	*        stripped from the preceding "user_" or "group_"
 	*/
-	public static function clean_row($row)
+	static public function clean_row($row)
 	{
 		$keys = array_keys($row);
 		$values = array_values($row);
@@ -168,7 +168,7 @@ class phpbb_avatar_manager
 	* @param string Array key
 	* @return string Key that has been stripped from its prefix
 	*/
-	protected static function strip_prefix($key)
+	static protected function strip_prefix($key)
 	{
 		return preg_replace('#^(?:user_|group_)#', '', $key);
 	}
@@ -181,7 +181,7 @@ class phpbb_avatar_manager
 	*
 	* @return string Cleaned driver name
 	*/
-	public static function clean_driver_name($name)
+	static public function clean_driver_name($name)
 	{
 		return str_replace('_', '.', $name);
 	}
@@ -194,7 +194,7 @@ class phpbb_avatar_manager
 	*
 	* @return string Prepared driver name
 	*/
-	public static function prepare_driver_name($name)
+	static public function prepare_driver_name($name)
 	{
 		return str_replace('.', '_', $name);
 	}
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php
index 262e7b238f..18f782f63e 100644
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/phpBB/includes/ucp/ucp_groups.php
@@ -492,7 +492,7 @@ class ucp_groups
 						if ($config['allow_avatar'])
 						{
 							$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
-							$avatar_drivers = $phpbb_avatar_manager->get_valid_drivers();
+							$avatar_drivers = $phpbb_avatar_manager->get_enabled_drivers();
 
 							// This is normalised data, without the group_ prefix
 							$avatar_data = phpbb_avatar_manager::clean_row($group_row);
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index 8ed5aff3e3..3f59cda4a0 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -562,7 +562,7 @@ class ucp_profile
 				if ($config['allow_avatar'] && $auth->acl_get('u_chgavatar'))
 				{
 					$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
-					$avatar_drivers = $phpbb_avatar_manager->get_valid_drivers();
+					$avatar_drivers = $phpbb_avatar_manager->get_enabled_drivers();
 
 					// This is normalised data, without the user_ prefix
 					$avatar_data = phpbb_avatar_manager::clean_row($user->data);