aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2012-09-08 14:15:56 +0200
committerAndreas Fischer <bantu@phpbb.com>2012-09-08 14:15:56 +0200
commitf2607fc9e80c6f9ad7543b7be5ea6f294aa6c40a (patch)
treee66e70073760fe6b362a7e262114e3ef391a09cc
parentb62c37c5799d4b9e018358c38a731d6664acadf1 (diff)
downloadforums-f2607fc9e80c6f9ad7543b7be5ea6f294aa6c40a.tar
forums-f2607fc9e80c6f9ad7543b7be5ea6f294aa6c40a.tar.gz
forums-f2607fc9e80c6f9ad7543b7be5ea6f294aa6c40a.tar.bz2
forums-f2607fc9e80c6f9ad7543b7be5ea6f294aa6c40a.tar.xz
forums-f2607fc9e80c6f9ad7543b7be5ea6f294aa6c40a.zip
[ticket/8713] Rename untrimed_variable() to untrimmed_variable().
PHPBB3-8713
Diffstat
-rw-r--r--phpBB/includes/acp/acp_language.php6
-rw-r--r--phpBB/includes/acp/acp_users.php4
-rw-r--r--phpBB/includes/functions.php4
-rw-r--r--phpBB/includes/request/request.php4
-rw-r--r--phpBB/includes/ucp/ucp_profile.php6
-rw-r--r--phpBB/includes/ucp/ucp_register.php4
-rw-r--r--phpBB/install/install_update.php4
7 files changed, 16 insertions, 16 deletions
diff --git a/phpBB/includes/acp/acp_language.php b/phpBB/includes/acp/acp_language.php
index 87cf605d8e..b5f5ba2312 100644
--- a/phpBB/includes/acp/acp_language.php
+++ b/phpBB/includes/acp/acp_language.php
@@ -100,11 +100,11 @@ class acp_language
switch ($method)
{
case 'ftp':
- $transfer = new ftp(request_var('host', ''), request_var('username', ''), $request->untrimed_variable('password', ''), request_var('root_path', ''), request_var('port', ''), request_var('timeout', ''));
+ $transfer = new ftp(request_var('host', ''), request_var('username', ''), $request->untrimmed_variable('password', ''), request_var('root_path', ''), request_var('port', ''), request_var('timeout', ''));
break;
case 'ftp_fsock':
- $transfer = new ftp_fsock(request_var('host', ''), request_var('username', ''), $request->untrimed_variable('password', ''), request_var('root_path', ''), request_var('port', ''), request_var('timeout', ''));
+ $transfer = new ftp_fsock(request_var('host', ''), request_var('username', ''), $request->untrimmed_variable('password', ''), request_var('root_path', ''), request_var('port', ''), request_var('timeout', ''));
break;
default:
@@ -404,7 +404,7 @@ class acp_language
trigger_error($user->lang['INVALID_UPLOAD_METHOD'], E_USER_ERROR);
}
- $transfer = new $method(request_var('host', ''), request_var('username', ''), $request->untrimed_variable('password', ''), request_var('root_path', ''), request_var('port', ''), request_var('timeout', ''));
+ $transfer = new $method(request_var('host', ''), request_var('username', ''), $request->untrimmed_variable('password', ''), request_var('root_path', ''), request_var('port', ''), request_var('timeout', ''));
if (($result = $transfer->open_session()) !== true)
{
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index b9958ed0f1..2905b84d57 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -770,8 +770,8 @@ class acp_users
'username' => utf8_normalize_nfc(request_var('user', $user_row['username'], true)),
'user_founder' => request_var('user_founder', ($user_row['user_type'] == USER_FOUNDER) ? 1 : 0),
'email' => strtolower(request_var('user_email', $user_row['user_email'])),
- 'new_password' => $request->untrimed_variable('new_password', '', true),
- 'password_confirm' => $request->untrimed_variable('password_confirm', '', true),
+ 'new_password' => $request->untrimmed_variable('new_password', '', true),
+ 'password_confirm' => $request->untrimmed_variable('password_confirm', '', true),
);
// Validation data - we do not check the password complexity setting here
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 1cdda60855..a2f8a57938 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3044,11 +3044,11 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa
trigger_error('NO_AUTH_ADMIN');
}
- $password = $request->untrimed_variable('password_' . $credential, '', true);
+ $password = $request->untrimmed_variable('password_' . $credential, '', true);
}
else
{
- $password = $request->untrimed_variable('password', '', true);
+ $password = $request->untrimmed_variable('password', '', true);
}
$username = request_var('username', '', true);
diff --git a/phpBB/includes/request/request.php b/phpBB/includes/request/request.php
index c6b6610af5..aa62c3b610 100644
--- a/phpBB/includes/request/request.php
+++ b/phpBB/includes/request/request.php
@@ -222,7 +222,7 @@ class phpbb_request implements phpbb_request_interface
* @return mixed The value of $_REQUEST[$var_name] run through {@link set_var set_var} to ensure that the type is the
* the same as that of $default. If the variable is not set $default is returned.
*/
- public function untrimed_variable($var_name, $default, $multibyte, $super_global = phpbb_request_interface::REQUEST)
+ public function untrimmed_variable($var_name, $default, $multibyte, $super_global = phpbb_request_interface::REQUEST)
{
return $this->_variable($var_name, $default, $multibyte, $super_global, false);
}
@@ -338,7 +338,7 @@ class phpbb_request implements phpbb_request_interface
}
/**
- * Helper function used by variable() and untrimed_variable().
+ * Helper function used by variable() and untrimmed_variable().
*
* @param string|array $var_name The form variable's name from which data shall be retrieved.
* If the value is an array this may be an array of indizes which will give
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index 68d5dd5d65..db1e3e4722 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -46,9 +46,9 @@ class ucp_profile
$data = array(
'username' => utf8_normalize_nfc(request_var('username', $user->data['username'], true)),
'email' => strtolower(request_var('email', $user->data['user_email'])),
- 'new_password' => $request->untrimed_variable('new_password', '', true),
- 'cur_password' => $request->untrimed_variable('cur_password', '', true),
- 'password_confirm' => $request->untrimed_variable('password_confirm', '', true),
+ 'new_password' => $request->untrimmed_variable('new_password', '', true),
+ 'cur_password' => $request->untrimmed_variable('cur_password', '', true),
+ 'password_confirm' => $request->untrimmed_variable('password_confirm', '', true),
);
add_form_key('ucp_reg_details');
diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php
index 6fab189a99..5ae92a5cea 100644
--- a/phpBB/includes/ucp/ucp_register.php
+++ b/phpBB/includes/ucp/ucp_register.php
@@ -170,8 +170,8 @@ class ucp_register
$data = array(
'username' => utf8_normalize_nfc(request_var('username', '', true)),
- 'new_password' => $request->untrimed_variable('new_password', '', true),
- 'password_confirm' => $request->untrimed_variable('password_confirm', '', true),
+ 'new_password' => $request->untrimmed_variable('new_password', '', true),
+ 'password_confirm' => $request->untrimmed_variable('password_confirm', '', true),
'email' => strtolower(request_var('email', '')),
'lang' => basename(request_var('lang', $user->lang_name)),
'tz' => request_var('tz', $timezone),
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php
index 4b5a23e497..1ecedecce6 100644
--- a/phpBB/install/install_update.php
+++ b/phpBB/install/install_update.php
@@ -862,7 +862,7 @@ class install_update extends module
$test_connection = false;
if ($test_ftp_connection || $submit)
{
- $transfer = new $method(request_var('host', ''), request_var('username', ''), $request->untrimed_variable('password', ''), request_var('root_path', ''), request_var('port', ''), request_var('timeout', ''));
+ $transfer = new $method(request_var('host', ''), request_var('username', ''), $request->untrimmed_variable('password', ''), request_var('root_path', ''), request_var('port', ''), request_var('timeout', ''));
$test_connection = $transfer->open_session();
// Make sure that the directory is correct by checking for the existence of common.php
@@ -948,7 +948,7 @@ class install_update extends module
}
else
{
- $transfer = new $method(request_var('host', ''), request_var('username', ''), $request->untrimed_variable('password', ''), request_var('root_path', ''), request_var('port', ''), request_var('timeout', ''));
+ $transfer = new $method(request_var('host', ''), request_var('username', ''), $request->untrimmed_variable('password', ''), request_var('root_path', ''), request_var('port', ''), request_var('timeout', ''));
$transfer->open_session();
}
generated by cgit v1.2.1 (git 2.21.0) at 2025-08-10 23:18:43 +0000