mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-13 12:14:06 +02:00
Code Issues Releases Wiki Activity

[feature/avatars] Remove $request property and pass as argument if needed

Browse Source 
Remove the $request property from the phpbb_avatar_driver class and rather
pass it as function argument if it's needed in a function. Currently this
is only the case for the class methods prepare_form() and process_form().

PHPBB3-10018
This commit is contained in:
Marc Alexander
2013-01-07 22:49:48 +01:00
parent 8867cb60b1
commit 023d7a972d
12 changed files with 41 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
phpBB/includes/avatar/driver/local.php
View File

@@ -36,10 +36,10 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
/**
* @inheritdoc
*/
public function prepare_form($template, $row, &$error)
public function prepare_form($request, $template, $row, &$error)
{
$avatar_list = $this->get_avatar_list();
$category = $this->request->variable('avatar_local_cat', '');
$category = $request->variable('avatar_local_cat', '');
foreach ($avatar_list as $cat => $null)
{
@@ -114,12 +114,12 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
/**
* @inheritdoc
*/
public function process_form($template, $row, &$error)
public function process_form($request, $template, $row, &$error)
{
$avatar_list = $this->get_avatar_list();
$category = $this->request->variable('avatar_local_cat', '');
$category = $request->variable('avatar_local_cat', '');
$file = $this->request->variable('avatar_local_file', '');
$file = $request->variable('avatar_local_file', '');
if (empty($category) || empty($file))
{