[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_1RC1-24-ge223441 - Git

20 May 2011

The branch, QA_3_4 has been updated
       via  e22344168fa0c717538f78e4b4e5935dd78dc69d (commit)
       via  b7a8179eb6bf0f1643970ac57a70b5b513a1cd4f (commit)
      from  1a1e548a396756656852771b3066673837570004 (commit)
- Log -----------------------------------------------------------------
commit e22344168fa0c717538f78e4b4e5935dd78dc69d
Merge: 1a1e548a396756656852771b3066673837570004 b7a8179eb6bf0f1643970ac57a70b5b513a1cd4f
Author: Michal Čihař mcihar@novell.com
Date:   Fri May 20 10:02:48 2011 +0200
Merge remote-tracking branch 'origin/MAINT_3_4_1' into 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 1152d6a..1350247 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


    