1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-19 06:51:33 +02:00

[ticket/12620] Fix rebase

PHPBB3-12620
This commit is contained in:
Tristan Darricau
2014-11-20 22:40:37 +01:00
parent 93f61a4a7d
commit 677b5b2cd4
11 changed files with 188 additions and 168 deletions

View File

@@ -1,26 +1,26 @@
<?php
namespace phpbb\avatar\driver;
class barfoo extends \phpbb\avatar\driver\driver
{
public function get_data($row)
{
return array();
}
public function prepare_form($request, $template, $user, $row, &$error)
{
return false;
}
public function process_form($request, $template, $user, $row, &$error)
{
return false;
}
public function get_template_name()
{
return 'barfoo.html';
}
}
<?php
namespace phpbb\avatar\driver;
class barfoo extends \phpbb\avatar\driver\driver
{
public function get_data($row)
{
return array();
}
public function prepare_form($request, $template, $user, $row, &$error)
{
return false;
}
public function process_form($request, $template, $user, $row, &$error)
{
return false;
}
public function get_template_name()
{
return 'barfoo.html';
}
}