[feature/avatars] Use protected instead of private

PHPBB3-10018
This commit is contained in:
Marc Alexander 2012-11-19 23:50:34 +01:00
parent 8d0c667dce
commit 858c59279c
4 changed files with 12 additions and 12 deletions

View file

@ -21,7 +21,7 @@ if (!defined('IN_PHPBB'))
*/
abstract class phpbb_avatar_driver implements phpbb_avatar_driver_interface
{
private $name;
protected $name;
/**
* Returns the name of the driver.

View file

@ -136,7 +136,7 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
*
* @return array An array containing the locally available avatars
*/
private function get_avatar_list()
protected function get_avatar_list()
{
$avatar_list = ($this->cache == null) ? false : $this->cache->get('av_local_list');

View file

@ -143,7 +143,7 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver
*
* @return bool True if user can upload, false if not
*/
private function can_upload()
protected function can_upload()
{
return (file_exists($this->phpbb_root_path . $this->config['avatar_path']) && phpbb_is_writable($this->phpbb_root_path . $this->config['avatar_path']) && (@ini_get('file_uploads') || strtolower(@ini_get('file_uploads')) == 'on'));
}

View file

@ -20,14 +20,14 @@ if (!defined('IN_PHPBB'))
*/
class phpbb_avatar_manager
{
private $phpbb_root_path;
private $phpEx;
private $config;
private $request;
private $cache;
private static $valid_drivers = false;
private $avatar_drivers;
private $container;
protected $phpbb_root_path;
protected $phpEx;
protected $config;
protected $request;
protected $cache;
protected static $valid_drivers = false;
protected $avatar_drivers;
protected $container;
/**
* Construct an avatar manager object
@ -102,7 +102,7 @@ class phpbb_avatar_manager
* Load the list of valid drivers
* This is executed once and fills self::$valid_drivers
**/
private function load_valid_drivers()
protected function load_valid_drivers()
{
if (!empty($this->avatar_drivers))
{