gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use url.php even in the setup script

Browse Source 
Signed-off-by: Michal Čihař <michal@cihar.com>
This commit is contained in:
Michal Čihař 2016-05-30 09:19:59 +02:00
parent 6f413680b1
commit 27505e1c2d
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/core.lib.php
View File

@ -755,7 +755,7 @@ function PMA_arrayRemove($path, &$array)
*/
function PMA_linkURL($url)
{
if (!preg_match('#^https?://#', $url) || defined('PMA_SETUP')) {
if (!preg_match('#^https?://#', $url)) {
return $url;
} else {
if (!function_exists('PMA_generate_common_url')) {
@ -763,7 +763,11 @@ function PMA_linkURL($url)
}
$params = array();
$params['url'] = $url;
return './url.php' . PMA_generate_common_url($params);
if (defined('PMA_SETUP')) {
return '../url.php' . PMA_generate_common_url($params);
} else {
return './url.php' . PMA_generate_common_url($params);
}
}
}