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

Merge remote-tracking branch 'origin/MAINT_3_4_1' into QA_3_4

Browse Source
This commit is contained in:
Michal Čihař
2011-05-20 10:02:48 +02:00
parent 1a1e548a39 b7a8179eb6
commit e22344168f
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libraries/core.lib.php
View File

@@ -681,15 +681,12 @@ function PMA_array_remove($path, &$array)
* @return string URL for a link.
*/
function PMA_linkURL($url) {
$params = array();
$params['url'] = $url;
$goto = 'url.php' . PMA_generate_common_url($params);
if (!preg_match('#^https?://#', $url)) {
if (!preg_match('#^https?://#', $url) || defined('PMA_SETUP')) {
return $url;
} elseif (defined('PMA_SETUP')) {
return '../' . $goto;
} else {
return './' . $goto;
$params = array();
$params['url'] = $url;
return './url.php' . PMA_generate_common_url($params);
}
}