From 44c15352ec1377e4237a3b0d843dbceab8a5ed03 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Sun, 2 Oct 2011 08:05:34 +0530 Subject: [PATCH 1/2] Revert 5a6a74481a341111a4b2e34021753a42a17f908e --- libraries/sanitizing.lib.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libraries/sanitizing.lib.php b/libraries/sanitizing.lib.php index 241af1cf1d..cbac64d3c4 100644 --- a/libraries/sanitizing.lib.php +++ b/libraries/sanitizing.lib.php @@ -17,8 +17,6 @@ function PMA_checkLink($url) $valid_starts = array( 'http://', 'https://', - 'http%3A%2F%2F', - 'https%3A%2F%2F', ); if (defined('PMA_SETUP')) { $valid_starts[] = '../Documentation.html'; @@ -58,7 +56,7 @@ function PMA_replaceBBLink($found) } /* Construct url */ - if (preg_match('/^https?:\/\//', $found[1])) { + if (substr($found[1], 0, 4) == 'http') { $url = PMA_linkURL($found[1]); } else { $url = $found[1]; From 634220143bdd5d77d359c19fdd78350f8a40e46c Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Sun, 2 Oct 2011 08:12:24 +0530 Subject: [PATCH 2/2] Valid starts --- libraries/sanitizing.lib.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libraries/sanitizing.lib.php b/libraries/sanitizing.lib.php index cbac64d3c4..2d2cff48d2 100644 --- a/libraries/sanitizing.lib.php +++ b/libraries/sanitizing.lib.php @@ -17,6 +17,8 @@ function PMA_checkLink($url) $valid_starts = array( 'http://', 'https://', + './url.php?url=http%3A%2F%2F', + './url.php?url=https%3A%2F%2F', ); if (defined('PMA_SETUP')) { $valid_starts[] = '../Documentation.html';