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

1 files changed, 4 insertions, 7 deletions

diff --git a/libraries/core.lib.php b/libraries/core.lib.php
index 1152d6ab1c..1350247ae2 100644
--- a/libraries/core.lib.php
+++ b/libraries/core.lib.php
@@ -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);
     }
 }