nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moved database comment into header (serverinfo) after database name

Browse Source
This commit is contained in:
Sebastian Mendel
2005-10-11 15:32:04 +00:00
parent a3b332fb51
commit f0c2ec358c
3 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -1,4 +1,4 @@
---------------------- ----------------------
phpMyAdmin - Changelog phpMyAdmin - Changelog
---------------------- ----------------------
@@ -21,6 +21,8 @@ $Source$
bug #1317655 information_schema browsing bug #1317655 information_schema browsing
* db_details_db_info.php, db_details_structure.php: * db_details_db_info.php, db_details_structure.php:
fixed display table statistics for information_schema 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> 2005-10-09 Marc Delisle <lem9@users.sourceforge.net>
* tbl_properties_links.php: invalid js confirmation and operation feedback * tbl_properties_links.php: invalid js confirmation and operation feedback

23
db_details_links.php
View File

@@ -109,29 +109,6 @@ if ($GLOBALS['cfg']['AllowUserDropDatabase']) {
echo PMA_getTabs( $tabs ); echo PMA_getTabs( $tabs );
unset( $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 * Displays a message
*/ */

29
header.inc.php
View File

@@ -217,9 +217,33 @@ if (empty($GLOBALS['is_header_sent'])) {
if (strstr($show_comment, '; InnoDB free')) { if (strstr($show_comment, '; InnoDB free')) {
$show_comment = preg_replace('@; InnoDB free:.*?$@' , '', $show_comment); $show_comment = preg_replace('@; InnoDB free:.*?$@' , '', $show_comment);
} }
echo '<!-- Table comment -->' . "\n" echo '<span class="table_comment" id="span_table_comment">'
. '<span class="table_comment" id="span_table_comment">&quot;' . htmlspecialchars($show_comment) . '&quot</span>' . "\n"; .'&quot;' . htmlspecialchars($show_comment)
.'&quot</span>' . "\n";
} // end if } // 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">&quot;'
.htmlspecialchars(implode(' ', $comment))
.'&quot</span>' . "\n";
} // end if
}
} }
} }
echo '</div>'; echo '</div>';
@@ -230,5 +254,4 @@ if (empty($GLOBALS['is_header_sent'])) {
*/ */
$GLOBALS['is_header_sent'] = TRUE; $GLOBALS['is_header_sent'] = TRUE;
} }
?> ?>