The branch, MAINT_3_4_1 has been updated via b7a8179eb6bf0f1643970ac57a70b5b513a1cd4f (commit) from ecfc8ba4f7b4ea612c58ab5726054ed0f28e200d (commit)

- Log ----------------------------------------------------------------- commit b7a8179eb6bf0f1643970ac57a70b5b513a1cd4f Author: Michal Čihař mcihar@novell.com Date: Fri May 20 09:46:15 2011 +0200

Can not use redirector for setup.

We currently have no reasonable way to protect it there.

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

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