diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2012-11-29 23:08:29 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2012-11-29 23:08:29 +0100 |
| commit | 81a1a21185abfc230097a355216d6c6b99511b20 (patch) | |
| tree | da241a139d9004c6a3303bce494a46d4aceb84e7 /phpBB/includes/avatar | |
| parent | cb1d98ab7f588a38fcae680aca839b805caf2a23 (diff) | |
| download | forums-81a1a21185abfc230097a355216d6c6b99511b20.tar forums-81a1a21185abfc230097a355216d6c6b99511b20.tar.gz forums-81a1a21185abfc230097a355216d6c6b99511b20.tar.bz2 forums-81a1a21185abfc230097a355216d6c6b99511b20.tar.xz forums-81a1a21185abfc230097a355216d6c6b99511b20.zip | |
[feature/avatars] Properly implement custom HTML in the interface
Previously the driver class added a variable that defined wether an avatar
driver would return custom HTML. The existence of this variable was
implied in the interface. It's also not needed which is why it has been
removed.
PHPBB3-10018
Diffstat (limited to 'phpBB/includes/avatar')
| -rw-r--r-- | phpBB/includes/avatar/driver/driver.php | 7 | ||||
| -rw-r--r-- | phpBB/includes/avatar/driver/gravatar.php | 6 | ||||
| -rw-r--r-- | phpBB/includes/avatar/driver/interface.php | 3 |
3 files changed, 3 insertions, 13 deletions
diff --git a/phpBB/includes/avatar/driver/driver.php b/phpBB/includes/avatar/driver/driver.php index 234186215b..6710f1f153 100644 --- a/phpBB/includes/avatar/driver/driver.php +++ b/phpBB/includes/avatar/driver/driver.php @@ -58,13 +58,6 @@ abstract class phpbb_avatar_driver implements phpbb_avatar_driver_interface protected $cache; /** - * This flag should be set to true if the avatar requires a nonstandard image - * tag, and will generate the html itself. - * @var boolean - */ - public $custom_html = false; - - /** * Construct a driver object * * @param phpbb_config $config phpBB configuration diff --git a/phpBB/includes/avatar/driver/gravatar.php b/phpBB/includes/avatar/driver/gravatar.php index 7e21a737a1..6ceac1a149 100644 --- a/phpBB/includes/avatar/driver/gravatar.php +++ b/phpBB/includes/avatar/driver/gravatar.php @@ -21,12 +21,10 @@ if (!defined('IN_PHPBB')) */ class phpbb_avatar_driver_gravatar extends phpbb_avatar_driver { - const GRAVATAR_URL = 'https://secure.gravatar.com/avatar/'; - /** - * @inheritdoc + * The URL for the gravatar service */ - public $custom_html = true; + const GRAVATAR_URL = 'https://secure.gravatar.com/avatar/'; /** * @inheritdoc diff --git a/phpBB/includes/avatar/driver/interface.php b/phpBB/includes/avatar/driver/interface.php index cc6b7edd17..d2f25a989f 100644 --- a/phpBB/includes/avatar/driver/interface.php +++ b/phpBB/includes/avatar/driver/interface.php @@ -40,8 +40,7 @@ interface phpbb_avatar_driver_interface public function get_data($row, $ignore_config = false); /** - * Returns custom html for displaying this avatar. - * Only called if $custom_html is true. + * Returns custom html if it is needed for displaying this avatar * * @param bool $ignore_config Whether this function should respect the users prefs * and board configuration configuration option, or should just render |