aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2012-11-14 20:04:02 +0100
committerMarc Alexander <admin@m-a-styles.de>2012-11-14 20:04:02 +0100
commit076785d76a1412394636095f0b296964419e2a4f (patch)
tree1e3ca13e52008953cd3beae1bc76d74ae1c442ca /phpBB/includes
parentb91702665a2ad555a172d09429d9beaac7ba88a7 (diff)
downloadforums-076785d76a1412394636095f0b296964419e2a4f.tar
forums-076785d76a1412394636095f0b296964419e2a4f.tar.gz
forums-076785d76a1412394636095f0b296964419e2a4f.tar.bz2
forums-076785d76a1412394636095f0b296964419e2a4f.tar.xz
forums-076785d76a1412394636095f0b296964419e2a4f.zip
[feature/avatars] Add support for custom avatar HTML code
PHPBB3-10018
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/avatar/driver/driver.php2
-rw-r--r--phpBB/includes/avatar/driver/interface.php2
-rw-r--r--phpBB/includes/functions_display.php2
3 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/avatar/driver/driver.php b/phpBB/includes/avatar/driver/driver.php
index 5cebd1533d..d0f77d2094 100644
--- a/phpBB/includes/avatar/driver/driver.php
+++ b/phpBB/includes/avatar/driver/driver.php
@@ -91,7 +91,7 @@ abstract class phpbb_avatar_driver implements phpbb_avatar_driver_interface
/**
* @inheritdoc
*/
- public function get_custom_html($row, $ignore_config = false)
+ public function get_custom_html($row, $ignore_config = false, $alt = '')
{
return '';
}
diff --git a/phpBB/includes/avatar/driver/interface.php b/phpBB/includes/avatar/driver/interface.php
index 4f1c1f73cf..16fef58e7a 100644
--- a/phpBB/includes/avatar/driver/interface.php
+++ b/phpBB/includes/avatar/driver/interface.php
@@ -41,7 +41,7 @@ interface phpbb_avatar_driver_interface
* the avatar anyways. Useful for the ACP.
* @return string HTML
*/
- public function get_custom_html($row, $ignore_config = false);
+ public function get_custom_html($row, $ignore_config = false, $alt = '');
/**
* @TODO
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index f84652fc50..bf1611a5de 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -1372,7 +1372,7 @@ function get_avatar($row, $alt, $ignore_config = false)
{
if ($avatar->custom_html)
{
- return $avatar->get_html($row, $ignore_config);
+ return $avatar->get_custom_html($row, $ignore_config, $alt);
}
$avatar_data = $avatar->get_data($row, $ignore_config);