diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-04-23 22:23:21 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2015-04-28 22:12:03 +0200 |
| commit | 416728fc172b03e06b376ca7efb085af27985dbb (patch) | |
| tree | d72eca610d512b0ca957fbc20b7749f28070e39d /phpBB/includes | |
| parent | ec207d0a71ba2c15e7cdcb2b59acd93aaa011223 (diff) | |
| parent | 18fc621d73757ef793fba08f7da4e048b293a059 (diff) | |
| download | forums-416728fc172b03e06b376ca7efb085af27985dbb.tar forums-416728fc172b03e06b376ca7efb085af27985dbb.tar.gz forums-416728fc172b03e06b376ca7efb085af27985dbb.tar.bz2 forums-416728fc172b03e06b376ca7efb085af27985dbb.tar.xz forums-416728fc172b03e06b376ca7efb085af27985dbb.zip | |
Merge branch 'ticket/security-180' into ticket/security-180-asc
Conflicts:
tests/security/redirect_test.php
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index fcfed8b2a4..e00231c360 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2309,7 +2309,7 @@ function redirect($url, $return = false, $disable_cd_check = false) // Attention: only able to redirect within the same domain if $disable_cd_check is false (yourdomain.com -> www.yourdomain.com will not work) if (!$disable_cd_check && $url_parts['host'] !== $user->host) { - $url = generate_board_url(); + trigger_error('Tried to redirect to potentially insecure url.', E_USER_ERROR); } } else if ($url[0] == '/') |