The branch, QA_3_3 has been updated
via 8c34269e520aaba4ddbba25e938d5338db4eed7d (commit)
from 1c49cd3d6422630be2549ce925cd91971565c5c7 (commit)
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1 +
db_structure.php | 44 ++++++++++++++++++++++++----------------
libraries/db_events.inc.php | 2 +-
libraries/db_routines.inc.php | 2 +-
4 files changed, 29 insertions(+), 20 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d6f020b..f9520b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,7 @@ $HeadURL:
https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
- bug #3062455 [export] with SQL, export procedures and routines before tables
- bug #3056023 [import] USE query not working
- bug #3038193 [display] Error when editing row with GEOMETRY column
+- bug #3062454 [interface] Display routines/events also when no tables are defined
3.3.7.0 (2010-09-07)
- patch #3050492 [PDF scratchboard] Cannot drag table box to the edge after
diff --git a/db_structure.php b/db_structure.php
index 2171ea5..7e5d70f 100644
--- a/db_structure.php
+++ b/db_structure.php
@@ -46,24 +46,6 @@ if (empty($is_info)) {
require_once './libraries/replication.inc.php';
}
-// 1. No tables
-if ($num_tables == 0) {
- echo '<p>' . $strNoTablesFound . '</p>' .
"\n";
-
- if (empty($db_is_information_schema)) {
- require './libraries/display_create_table.lib.php';
- } // end if (Create Table dialog)
-
- /**
- * Displays the footer
- */
- require_once './libraries/footer.inc.php';
- exit;
-}
-
-// else
-// 2. Shows table informations - staybyte - 11 June 2001
-
require_once './libraries/bookmark.lib.php';
require_once './libraries/mysql_charsets.lib.php';
@@ -113,6 +95,32 @@ if (true == $cfg['PropertiesIconic']) {
$titles['NoEmpty'] = $strEmpty;
}
+// 1. No tables
+if ($num_tables == 0) {
+ echo '<p>' . $strNoTablesFound . '</p>' . "\n";
+
+ // Routines
+ require './libraries/db_routines.inc.php';
+
+ // Events
+ if (PMA_MYSQL_INT_VERSION > 50100) {
+ require './libraries/db_events.inc.php';
+ }
+
+ if (empty($db_is_information_schema)) {
+ require './libraries/display_create_table.lib.php';
+ } // end if (Create Table dialog)
+
+ /**
+ * Displays the footer
+ */
+ require_once './libraries/footer.inc.php';
+ exit;
+}
+
+// else
+// 2. Shows table informations
+
/**
* Displays the tables list
*/
diff --git a/libraries/db_events.inc.php b/libraries/db_events.inc.php
index 9ff5f76..64298ec 100644
--- a/libraries/db_events.inc.php
+++ b/libraries/db_events.inc.php
@@ -50,7 +50,7 @@ if ($events) {
</tr>',
($ct%2 == 0) ? 'even' : 'odd',
$event['EVENT_NAME'],
- ! empty($definition) ? PMA_linkOrButton('db_sql.php?' .
$url_query . '&sql_query=' . urlencode($definition) .
'&show_query=1&delimiter=' . urlencode($delimiter),
$titles['Structure']) : ' ',
+ ! empty($definition) ? PMA_linkOrButton('db_sql.php?' .
$url_query . '&sql_query=' . urlencode($definition) .
'&show_query=1&db_query_force=1&delimiter=' .
urlencode($delimiter), $titles['Structure']) : ' ',
'<a href="sql.php?' . $url_query .
'&sql_query=' . urlencode($sqlDrop) . '" onclick="return
confirmLink(this, \'' . PMA_jsFormat($sqlDrop, false) .
'\')">' . $titles['Drop'] . '</a>',
$event['EVENT_TYPE']);
$ct++;
diff --git a/libraries/db_routines.inc.php b/libraries/db_routines.inc.php
index 29c1ccd..96da080 100644
--- a/libraries/db_routines.inc.php
+++ b/libraries/db_routines.inc.php
@@ -79,7 +79,7 @@ if ($routines) {
</tr>',
($ct%2 == 0) ? 'even' : 'odd',
$routine['ROUTINE_NAME'],
- ! empty($definition) ? PMA_linkOrButton('db_sql.php?' .
$url_query . '&sql_query=' . urlencode($definition) .
'&show_query=1&delimiter=' . urlencode($delimiter),
$titles['Structure']) : ' ',
+ ! empty($definition) ? PMA_linkOrButton('db_sql.php?' .
$url_query . '&sql_query=' . urlencode($definition) .
'&show_query=1&db_query_force=1&delimiter=' .
urlencode($delimiter), $titles['Structure']) : ' ',
'<a href="sql.php?' . $url_query .
'&sql_query=' . urlencode($sqlDropProc) . '" onclick="return
confirmLink(this, \'' . PMA_jsFormat($sqlDropProc, false) .
'\')">' . $titles['Drop'] . '</a>',
$routine['ROUTINE_TYPE'],
$routine['DTD_IDENTIFIER']);
hooks/post-receive
--
phpMyAdmin