diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-04-07 14:20:39 -0400 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-04-07 14:20:39 -0400 |
| commit | 2efa0c2f8e36cc36ac2c9e04ab5ff79fcdad781e (patch) | |
| tree | 299b3675b4d0783b92fd45bdc43efd98578402c6 /phpBB/includes/functions.php | |
| parent | f0176b53934e78b830b890ef46c1e8e7c233bee4 (diff) | |
| parent | 60be4c70a7e2e3b8a31420733f6389a6131b0334 (diff) | |
| download | forums-2efa0c2f8e36cc36ac2c9e04ab5ff79fcdad781e.tar forums-2efa0c2f8e36cc36ac2c9e04ab5ff79fcdad781e.tar.gz forums-2efa0c2f8e36cc36ac2c9e04ab5ff79fcdad781e.tar.bz2 forums-2efa0c2f8e36cc36ac2c9e04ab5ff79fcdad781e.tar.xz forums-2efa0c2f8e36cc36ac2c9e04ab5ff79fcdad781e.zip | |
Merge remote-tracking branch 'github-nickvergessen/ticket/12358' into develop-ascraeus
* github-nickvergessen/ticket/12358:
[ticket/12358] Correctly check and change the redirect url for ajax requests
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 8c29bc7171..69f7c3f162 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2437,19 +2437,19 @@ function meta_refresh($time, $url, $disable_cd_check = false) { global $template, $refresh_data, $request; + $url = redirect($url, true, $disable_cd_check); if ($request->is_ajax()) { $refresh_data = array( 'time' => $time, - 'url' => str_replace('&', '&', $url) + 'url' => $url, ); } else { - $url = redirect($url, true, $disable_cd_check); + // For XHTML compatibility we change back & to & $url = str_replace('&', '&', $url); - // For XHTML compatibility we change back & to & $template->assign_vars(array( 'META' => '<meta http-equiv="refresh" content="' . $time . '; url=' . $url . '" />') ); |