The branch, master has been updated via 2845fbb451cca0485b2fa82d2a77b4ee1fcfba6e (commit) via 4bc347507662d0ef62e2897390191b9e206db809 (commit) via 2d7cbdfc4d6ad9066dad49918ed710f872e59020 (commit) from 7f41f94a0e93a8c2eaaabe3754f9ae3a9d7bb5e4 (commit)
- Log ----------------------------------------------------------------- commit 2845fbb451cca0485b2fa82d2a77b4ee1fcfba6e Merge: 4bc347507662d0ef62e2897390191b9e206db809 7f41f94a0e93a8c2eaaabe3754f9ae3a9d7bb5e4 Author: Dieter Adriaenssens ruleant@users.sourceforge.net Date: Thu Oct 7 21:17:55 2010 +0200
Merge branch 'master' of ssh://ruleant@phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
commit 4bc347507662d0ef62e2897390191b9e206db809 Merge: 90c48f8696415f257d97dec8194568b0b4c0ca89 2d7cbdfc4d6ad9066dad49918ed710f872e59020 Author: Dieter Adriaenssens ruleant@users.sourceforge.net Date: Thu Oct 7 21:16:35 2010 +0200
Merge branch 'QA_3_3'
-----------------------------------------------------------------------
Summary of changes: libraries/db_events.inc.php | 5 ----- libraries/db_routines.inc.php | 5 ----- 2 files changed, 0 insertions(+), 10 deletions(-)
diff --git a/libraries/db_events.inc.php b/libraries/db_events.inc.php index 429f8bc..82ef51f 100644 --- a/libraries/db_events.inc.php +++ b/libraries/db_events.inc.php @@ -8,11 +8,6 @@ if (! defined('PHPMYADMIN')) { exit; }
-/** - * Append goto to ulr_query. - */ -$url_query .= '&goto=db_structure.php'; - $events = PMA_DBI_fetch_result('SELECT EVENT_NAME, EVENT_TYPE FROM information_schema.EVENTS WHERE EVENT_SCHEMA= '' . PMA_sqlAddslashes($db,true) . '';');
if ($events) { diff --git a/libraries/db_routines.inc.php b/libraries/db_routines.inc.php index c0231d9..49819dd 100644 --- a/libraries/db_routines.inc.php +++ b/libraries/db_routines.inc.php @@ -18,11 +18,6 @@ if (! defined('PHPMYADMIN')) { exit; }
-/** - * Append goto to ulr_query. - */ -$url_query .= '&goto=db_structure.php'; - $routines = PMA_DBI_fetch_result('SELECT SPECIFIC_NAME,ROUTINE_NAME,ROUTINE_TYPE,DTD_IDENTIFIER FROM information_schema.ROUTINES WHERE ROUTINE_SCHEMA= '' . PMA_sqlAddslashes($db,true) . '';');
if ($routines) {
hooks/post-receive