From 24d57cf2a4fb5d6d6737e92145df6f1c61e5291b Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Fri, 29 Jun 2007 14:22:48 +0000
Subject: [PATCH] bug #1745257 Invalid DB name is still displayed

---
 ChangeLog     |  1 +
 db_create.php | 23 +++++++++++++----------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 53feaa1be..6c00f9abb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,7 @@ $HeadURL$
 - bug #1729027 Sorting results of VIEW browsing
 - bug #1733012 Unwanted table alias in delete button
 - bug #1736405 Pretty printer and HTML line breaks
+- bug #1745257 Invalid DB name is still displayed
 
 2.10.2.0 (2007-06-15)
 
diff --git a/db_create.php b/db_create.php
index 35a6de244..481831091 100644
--- a/db_create.php
+++ b/db_create.php
@@ -8,10 +8,8 @@
  */
 require_once('./libraries/common.lib.php');
 $js_to_run = 'functions.js';
-require_once('./libraries/header.inc.php');
 require_once('./libraries/mysql_charsets.lib.php');
 
-
 PMA_checkParameters(array('db'));
 
 /**
@@ -32,13 +30,18 @@ if (!empty($db_collation) && PMA_MYSQL_INT_VERSION >= 40101) {
 }
 $sql_query .= ';';
 
-$result = PMA_DBI_query($sql_query);
-
-
-/**
- * Displays the result and calls default page
- */
-$message = $strDatabase . ' ' . htmlspecialchars($db) . ' ' . $strHasBeenCreated;
-require_once('./' . $cfg['DefaultTabDatabase']);
+$result = PMA_DBI_try_query($sql_query);
 
+if (! $result) {
+    $message = PMA_DBI_getError();
+    // avoid displaying the not-created db name in header or navi panel
+    $GLOBALS['db'] = '';
+    $GLOBALS['table'] = '';
+    require_once './libraries/header.inc.php';
+    require_once './main.php';
+} else {
+    $message = $strDatabase . ' ' . htmlspecialchars($db) . ' ' . $strHasBeenCreated;
+    require_once './libraries/header.inc.php';
+    require_once './' . $cfg['DefaultTabDatabase'];
+}
 ?>