diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2012-11-16 17:19:04 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2012-11-16 17:19:04 +0100 |
| commit | 0a5d54cc9b4ece668ba59d41a281c147874f3c5c (patch) | |
| tree | d14bc9901b2597e4dd2b723f5db6b6261e6be9ee /phpBB/includes/avatar | |
| parent | cc86bd9267b854003628b33ccb21557c88049734 (diff) | |
| download | forums-0a5d54cc9b4ece668ba59d41a281c147874f3c5c.tar forums-0a5d54cc9b4ece668ba59d41a281c147874f3c5c.tar.gz forums-0a5d54cc9b4ece668ba59d41a281c147874f3c5c.tar.bz2 forums-0a5d54cc9b4ece668ba59d41a281c147874f3c5c.tar.xz forums-0a5d54cc9b4ece668ba59d41a281c147874f3c5c.zip | |
[feature/avatars] Shorten avatar driver's class name
The addition of "core_" that was used until now would require additional
avatar drivers (e.g. in extensions) to also include that in their class
name which would be incorrect.
PHPBB3-10018
Diffstat (limited to 'phpBB/includes/avatar')
| -rw-r--r-- | phpBB/includes/avatar/driver/driver.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/avatar/driver/gravatar.php (renamed from phpBB/includes/avatar/driver/core/gravatar.php) | 2 | ||||
| -rw-r--r-- | phpBB/includes/avatar/driver/local.php (renamed from phpBB/includes/avatar/driver/core/local.php) | 2 | ||||
| -rw-r--r-- | phpBB/includes/avatar/driver/remote.php (renamed from phpBB/includes/avatar/driver/core/remote.php) | 2 | ||||
| -rw-r--r-- | phpBB/includes/avatar/driver/upload.php (renamed from phpBB/includes/avatar/driver/core/upload.php) | 2 | ||||
| -rw-r--r-- | phpBB/includes/avatar/manager.php | 6 |
6 files changed, 9 insertions, 9 deletions
diff --git a/phpBB/includes/avatar/driver/driver.php b/phpBB/includes/avatar/driver/driver.php index cce0a8db0f..9a213ce730 100644 --- a/phpBB/includes/avatar/driver/driver.php +++ b/phpBB/includes/avatar/driver/driver.php @@ -147,7 +147,7 @@ abstract class phpbb_avatar_driver implements phpbb_avatar_driver_interface **/ public function is_enabled() { - $driver = preg_replace('#^phpbb_avatar_driver_core_#', '', get_class($this)); + $driver = preg_replace('#^phpbb_avatar_driver_#', '', get_class($this)); return $this->config["allow_avatar_$driver"]; } @@ -157,7 +157,7 @@ abstract class phpbb_avatar_driver implements phpbb_avatar_driver_interface **/ public function get_template_name() { - $driver = preg_replace('#^phpbb_avatar_driver_core_#', '', get_class($this)); + $driver = preg_replace('#^phpbb_avatar_driver_#', '', get_class($this)); $template = "ucp_avatar_options_$driver.html"; return $template; diff --git a/phpBB/includes/avatar/driver/core/gravatar.php b/phpBB/includes/avatar/driver/gravatar.php index 34aa0fa27f..0ac7d71bef 100644 --- a/phpBB/includes/avatar/driver/core/gravatar.php +++ b/phpBB/includes/avatar/driver/gravatar.php @@ -20,7 +20,7 @@ if (!defined('IN_PHPBB')) * @package avatars */ // @todo: rename classes to phpbb_ext_foo_avatar_driver_foo and similar -class phpbb_avatar_driver_core_gravatar extends phpbb_avatar_driver +class phpbb_avatar_driver_gravatar extends phpbb_avatar_driver { /** * We'll need to create a different type of avatar for gravatar diff --git a/phpBB/includes/avatar/driver/core/local.php b/phpBB/includes/avatar/driver/local.php index a8ed8ad130..e4648381c2 100644 --- a/phpBB/includes/avatar/driver/core/local.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_core_local extends phpbb_avatar_driver +class phpbb_avatar_driver_local extends phpbb_avatar_driver { /** * @inheritdoc diff --git a/phpBB/includes/avatar/driver/core/remote.php b/phpBB/includes/avatar/driver/remote.php index 8b315b80a8..fbe158d200 100644 --- a/phpBB/includes/avatar/driver/core/remote.php +++ b/phpBB/includes/avatar/driver/remote.php @@ -19,7 +19,7 @@ if (!defined('IN_PHPBB')) * Handles avatars hosted remotely * @package avatars */ -class phpbb_avatar_driver_core_remote extends phpbb_avatar_driver +class phpbb_avatar_driver_remote extends phpbb_avatar_driver { /** * @inheritdoc diff --git a/phpBB/includes/avatar/driver/core/upload.php b/phpBB/includes/avatar/driver/upload.php index 1ad1133bff..a86cc44d2f 100644 --- a/phpBB/includes/avatar/driver/core/upload.php +++ b/phpBB/includes/avatar/driver/upload.php @@ -19,7 +19,7 @@ if (!defined('IN_PHPBB')) * Handles avatars uploaded to the board * @package avatars */ -class phpbb_avatar_driver_core_upload extends phpbb_avatar_driver +class phpbb_avatar_driver_upload extends phpbb_avatar_driver { /** * @inheritdoc diff --git a/phpBB/includes/avatar/manager.php b/phpBB/includes/avatar/manager.php index 4256188f0a..546cdcdc05 100644 --- a/phpBB/includes/avatar/manager.php +++ b/phpBB/includes/avatar/manager.php @@ -57,13 +57,13 @@ class phpbb_avatar_manager switch ($avatar_type) { case AVATAR_GALLERY: - $avatar_type = 'avatar.driver.core.local'; + $avatar_type = 'avatar.driver.local'; break; case AVATAR_UPLOAD: - $avatar_type = 'avatar.driver.core.upload'; + $avatar_type = 'avatar.driver.upload'; break; case AVATAR_REMOTE: - $avatar_type = 'avatar.driver.core.remote'; + $avatar_type = 'avatar.driver.remote'; break; } |