[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_1RC1-1793-gfc59c64

[Michal Čihař]

The branch, master has been updated
       via  fc59c64fbd94a408f0500576d97ba7d29a254d00 (commit)
       via  e22344168fa0c717538f78e4b4e5935dd78dc69d (commit)
       via  b7a8179eb6bf0f1643970ac57a70b5b513a1cd4f (commit)
      from  b3a79a9344297ec9d391e32e8c9ec247cd9a98c0 (commit)


- Log -----------------------------------------------------------------
commit fc59c64fbd94a408f0500576d97ba7d29a254d00
Merge: b3a79a9344297ec9d391e32e8c9ec247cd9a98c0 e22344168fa0c717538f78e4b4e5935dd78dc69d
Author: Michal Čihař <mcihar at novell.com>
Date:   Fri May 20 10:03:19 2011 +0200

    Merge remote-tracking branch 'origin/QA_3_4'

-----------------------------------------------------------------------

Summary of changes:
 libraries/core.lib.php |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/libraries/core.lib.php b/libraries/core.lib.php
index 63f1a25..51315d7 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);
     }
 }
 


hooks/post-receive
-- 
phpMyAdmin