Skip to content

Commit b7a8179

Browse files
committed
Can not use redirector for setup.
We currently have no reasonable way to protect it there.
1 parent ecfc8ba commit b7a8179

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

libraries/core.lib.php

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -681,15 +681,12 @@ function PMA_array_remove($path, &$array)
681681
* @return string URL for a link.
682682
*/
683683
function PMA_linkURL($url) {
684-
$params = array();
685-
$params['url'] = $url;
686-
$goto = 'url.php' . PMA_generate_common_url($params);
687-
if (!preg_match('#^https?://#', $url)) {
684+
if (!preg_match('#^https?://#', $url) || defined('PMA_SETUP')) {
688685
return $url;
689-
} elseif (defined('PMA_SETUP')) {
690-
return '../' . $goto;
691686
} else {
692-
return './' . $goto;
687+
$params = array();
688+
$params['url'] = $url;
689+
return './url.php' . PMA_generate_common_url($params);
693690
}
694691
}
695692

0 commit comments

Comments
 (0)