From 024261a924af1d3115ca98b73c269cbc115130ba Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Tue, 20 Dec 2005 13:14:44 +0000
Subject: [PATCH] does not return to correct page after a bookmark creation

---
 ChangeLog                | 4 ++++
 libraries/common.lib.php | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 6d1667c3e..b90b9b3ea 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2005-12-20 Marc Delisle  <lem9@users.sourceforge.net>
+    * libraries/common.lib.php: does not return to correct page after
+      the creation of a bookmark
+
 2005-12-17 Sebastian Mendel <cybot_tm@users.sourceforge.net>
     * db_details_importdocsql.php, db_operations.php,
       libraries\relation.lib.php, libraries\relation_cleanup.lib.php
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 3afbabbe7..76ce1ed17 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -2692,7 +2692,7 @@ if (!in_array($__redirect, $goto_whitelist)) {
  * @var string  $goto   holds page that should be displayed
  */
 // Security fix: disallow accessing serious server files via "?goto="
-if (isset($_REQUEST['goto']) && in_array($_REQUEST['goto'], $goto_whitelist)) {
+if (isset($_REQUEST['goto']) && in_array(substr($_REQUEST['goto'], 0, strpos($_REQUEST['goto'] . '?', '?')), $goto_whitelist)) {
     $GLOBALS['goto'] = $_REQUEST['goto'];
     $GLOBALS['url_params']['goto'] = $goto;
 } else {