moved database comment into header (serverinfo) after database name
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
----------------------
|
||||
----------------------
|
||||
phpMyAdmin - Changelog
|
||||
----------------------
|
||||
|
||||
@@ -21,6 +21,8 @@ $Source$
|
||||
bug #1317655 information_schema browsing
|
||||
* db_details_db_info.php, db_details_structure.php:
|
||||
fixed display table statistics for information_schema
|
||||
* db_details_links.php, header.inc.php:
|
||||
moved database comment into header (serverinfo) after database name
|
||||
|
||||
2005-10-09 Marc Delisle <lem9@users.sourceforge.net>
|
||||
* tbl_properties_links.php: invalid js confirmation and operation feedback
|
||||
|
@@ -109,29 +109,6 @@ if ($GLOBALS['cfg']['AllowUserDropDatabase']) {
|
||||
echo PMA_getTabs( $tabs );
|
||||
unset( $tabs );
|
||||
|
||||
/**
|
||||
* Settings for relations stuff
|
||||
*/
|
||||
require_once('./libraries/relation.lib.php');
|
||||
$cfgRelation = PMA_getRelationsParam();
|
||||
|
||||
// Get additional information about tables for tooltip is done in db_details_db_info.php only once
|
||||
if ($cfgRelation['commwork']) {
|
||||
$comment = PMA_getComments($db);
|
||||
|
||||
/**
|
||||
* Displays table comment
|
||||
*/
|
||||
if (is_array($comment)) {
|
||||
?>
|
||||
<!-- DB comment -->
|
||||
<p id="dbComment"><i>
|
||||
<?php echo htmlspecialchars(implode(' ', $comment)) . "\n"; ?>
|
||||
</i></p>
|
||||
<?php
|
||||
} // end if
|
||||
}
|
||||
|
||||
/**
|
||||
* Displays a message
|
||||
*/
|
||||
|
@@ -217,9 +217,33 @@ if (empty($GLOBALS['is_header_sent'])) {
|
||||
if (strstr($show_comment, '; InnoDB free')) {
|
||||
$show_comment = preg_replace('@; InnoDB free:.*?$@' , '', $show_comment);
|
||||
}
|
||||
echo '<!-- Table comment -->' . "\n"
|
||||
. '<span class="table_comment" id="span_table_comment">"' . htmlspecialchars($show_comment) . '"</span>' . "\n";
|
||||
echo '<span class="table_comment" id="span_table_comment">'
|
||||
.'"' . htmlspecialchars($show_comment)
|
||||
.'"</span>' . "\n";
|
||||
} // end if
|
||||
} else {
|
||||
// no table selected, display database comment if present
|
||||
/**
|
||||
* Settings for relations stuff
|
||||
*/
|
||||
require_once('./libraries/relation.lib.php');
|
||||
$cfgRelation = PMA_getRelationsParam();
|
||||
|
||||
// Get additional information about tables for tooltip is done
|
||||
// in db_details_db_info.php only once
|
||||
if ($cfgRelation['commwork']) {
|
||||
$comment = PMA_getComments( $GLOBALS['db'] );
|
||||
|
||||
/**
|
||||
* Displays table comment
|
||||
*/
|
||||
if ( is_array( $comment ) ) {
|
||||
echo '<span class="table_comment"'
|
||||
.' id="span_table_comment">"'
|
||||
.htmlspecialchars(implode(' ', $comment))
|
||||
.'"</span>' . "\n";
|
||||
} // end if
|
||||
}
|
||||
}
|
||||
}
|
||||
echo '</div>';
|
||||
@@ -230,5 +254,4 @@ if (empty($GLOBALS['is_header_sent'])) {
|
||||
*/
|
||||
$GLOBALS['is_header_sent'] = TRUE;
|
||||
}
|
||||
|
||||
?>
|
||||
?>
|
Reference in New Issue
Block a user