aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_profile_fields.php
diff options
context:
space:
mode:
authorIgor Wiedler <igor@wiedler.ch>2010-10-10 18:39:44 +0200
committerIgor Wiedler <igor@wiedler.ch>2010-10-10 18:39:44 +0200
commita885095897054c91ab68b753ce2a86ae74f2f666 (patch)
tree9adb9074112239838a1a69078702f08e0bcda9be /phpBB/includes/functions_profile_fields.php
parent9a39f55c24fee8fe817823097e8f596b92ab7049 (diff)
parentc2ffa78521a656b1a183d75c8de2f88624011967 (diff)
downloadforums-a885095897054c91ab68b753ce2a86ae74f2f666.tar
forums-a885095897054c91ab68b753ce2a86ae74f2f666.tar.gz
forums-a885095897054c91ab68b753ce2a86ae74f2f666.tar.bz2
forums-a885095897054c91ab68b753ce2a86ae74f2f666.tar.xz
forums-a885095897054c91ab68b753ce2a86ae74f2f666.zip
Merge branch 'feature/igorw/request-class' into develop
* feature/igorw/request-class: (21 commits) [feature/request-class] Fix mcp.php mode parameter [feature/request-class] Fix remember and session hide on login [feature/request-class] Fix missing include in database_update [feature/request-class] Make additional request test cases run [feature/request-class] Adjust some trailing newlines [feature/request-class] Remove tricky $_* is_array from acp_profile [feature/request-class] Convert any direct access to $_* to use $request [feature/request-class] Add $request to style.php, minor change [feature/request-class] Prevent recursive_set_var from applying htmlspecialchars twice [feature/request-class] Removal of direct access to some superglobals [feature/request-class] Refactor request classes to use autoloading [feature/request-class] Automatically normalize multibyte data in request_var [feature/request-class] Request class test now uses a type cast helper mock. [feature/request-class] Refactored request class and wrapper functions. [feature/request-class] Extracted type casting helpers from the request class. [feature/request-class] Replace direct use of GET/REQUEST with request_var. [feature/request-class] Use the request class in the installer & updater. [feature/request-class] request_var should return after setting the request object. [feature/request-class] Instantiate a global request class instance. [feature/request-class] New request class supports recursive arrays. ...
Diffstat (limited to 'phpBB/includes/functions_profile_fields.php')
-rw-r--r--phpBB/includes/functions_profile_fields.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/includes/functions_profile_fields.php b/phpBB/includes/functions_profile_fields.php
index 3937cf9c21..3ad06a3383 100644
--- a/phpBB/includes/functions_profile_fields.php
+++ b/phpBB/includes/functions_profile_fields.php
@@ -610,6 +610,7 @@ class custom_profile
function get_var($field_validation, &$profile_row, $default_value, $preview)
{
global $user;
+ global $request;
$profile_row['field_ident'] = (isset($profile_row['var_name'])) ? $profile_row['var_name'] : 'pf_' . $profile_row['field_ident'];
$user_ident = $profile_row['field_ident'];
@@ -622,7 +623,7 @@ class custom_profile
{
if (isset($_REQUEST[$profile_row['field_ident']]))
{
- $value = ($_REQUEST[$profile_row['field_ident']] === '') ? NULL : request_var($profile_row['field_ident'], $default_value);
+ $value = ($request->variable($profile_row['field_ident'], '') === '') ? NULL : $request->variable($profile_row['field_ident'], $default_value);
}
else
{
@@ -894,6 +895,7 @@ class custom_profile
{
global $phpbb_root_path, $phpEx;
global $config;
+ global $request;
$var_name = 'pf_' . $profile_row['field_ident'];
@@ -938,7 +940,7 @@ class custom_profile
break;
case FIELD_INT:
- if (isset($_REQUEST[$var_name]) && $_REQUEST[$var_name] === '')
+ if (isset($_REQUEST[$var_name]) && $request->variable($var_name, '') === '')
{
$var = NULL;
}