diff options
| author | Joseph Warner <hardolaf@hardolaf.com> | 2013-09-02 16:47:40 -0400 |
|---|---|---|
| committer | Joseph Warner <hardolaf@hardolaf.com> | 2013-09-02 16:47:53 -0400 |
| commit | 29e3768ecc7bc8adf96d4e31c4e05a6f1de6735a (patch) | |
| tree | c79a5ce75fef95c0d615e619e90de9c77acf3237 /phpBB/includes/ucp | |
| parent | 63ba06406575b5c7882ef26ee3b5469ca16afec5 (diff) | |
| download | forums-29e3768ecc7bc8adf96d4e31c4e05a6f1de6735a.tar forums-29e3768ecc7bc8adf96d4e31c4e05a6f1de6735a.tar.gz forums-29e3768ecc7bc8adf96d4e31c4e05a6f1de6735a.tar.bz2 forums-29e3768ecc7bc8adf96d4e31c4e05a6f1de6735a.tar.xz forums-29e3768ecc7bc8adf96d4e31c4e05a6f1de6735a.zip | |
[feature/oauth] More minor changes from review
PHPBB3-11673
Diffstat (limited to 'phpBB/includes/ucp')
| -rw-r--r-- | phpBB/includes/ucp/ucp_login_link.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_register.php | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/phpBB/includes/ucp/ucp_login_link.php b/phpBB/includes/ucp/ucp_login_link.php index bf7df1d4eb..4620eb9b9e 100644 --- a/phpBB/includes/ucp/ucp_login_link.php +++ b/phpBB/includes/ucp/ucp_login_link.php @@ -236,8 +236,8 @@ class ucp_login_link */ protected function perform_redirect() { - global $phpEx; - $url = append_sid('index.' . $phpEx); + global $phpbb_root_path, $phpEx; + $url = append_sid($phpbb_root_path . 'index.' . $phpEx); redirect($url); } } diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php index e3a1ac1fb0..372eecbb57 100644 --- a/phpBB/includes/ucp/ucp_register.php +++ b/phpBB/includes/ucp/ucp_register.php @@ -86,7 +86,7 @@ class ucp_register // Handle login_link data added to $_hidden_fields $login_link_data = $this->get_login_link_data_array(); - if ($login_link_data !== array()) + if (!empty($login_link_data)) { // Confirm that we have all necessary data $auth_provider = 'auth.provider.' . $request->variable('auth_provider', $config['auth_method']); @@ -518,12 +518,13 @@ class ucp_register $var_names = $request->variable_names(phpbb_request_interface::POST); $login_link_data = array(); + $string_start_length = strlen('login_link_'); foreach ($var_names as $var_name) { if (strpos($var_name, 'login_link_') === 0) { - $key_name = str_replace('login_link_', '', $var_name); + $key_name = substr($var_name, $string_start_length); $login_link_data[$key_name] = $request->variable($var_name, '', false, phpbb_request_interface::POST); } } |