[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5-20536-g6342201

The branch, master has been updated via 634220143bdd5d77d359c19fdd78350f8a40e46c (commit) via 44c15352ec1377e4237a3b0d843dbceab8a5ed03 (commit) from e15ff037e3d8e2771d84eee423195c5b78a6bc3b (commit) - Log ----------------------------------------------------------------- commit 634220143bdd5d77d359c19fdd78350f8a40e46c Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: Sun Oct 2 08:12:24 2011 +0530 Valid starts commit 44c15352ec1377e4237a3b0d843dbceab8a5ed03 Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: Sun Oct 2 08:05:34 2011 +0530 Revert 5a6a74481a341111a4b2e34021753a42a17f908e ----------------------------------------------------------------------- Summary of changes: libraries/sanitizing.lib.php | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/sanitizing.lib.php b/libraries/sanitizing.lib.php index 241af1c..2d2cff4 100644 --- a/libraries/sanitizing.lib.php +++ b/libraries/sanitizing.lib.php @@ -17,8 +17,8 @@ function PMA_checkLink($url) $valid_starts = array( 'http://', 'https://', - 'http%3A%2F%2F', - 'https%3A%2F%2F', + './url.php?url=http%3A%2F%2F', + './url.php?url=https%3A%2F%2F', ); if (defined('PMA_SETUP')) { $valid_starts[] = '../Documentation.html'; @@ -58,7 +58,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]; hooks/post-receive -- phpMyAdmin
participants (1)
-
Madhura Jayaratne