make use of PMA_getDbComment()
This commit is contained in:
@@ -38,15 +38,15 @@ if (strlen($table)) {
|
||||
}
|
||||
|
||||
if ($cfgRelation['commwork']) {
|
||||
$comment = PMA_getComments($db);
|
||||
$comment = PMA_getDbComment($db);
|
||||
|
||||
/**
|
||||
* Displays DB comment
|
||||
*/
|
||||
if (is_array($comment)) {
|
||||
if ($comment) {
|
||||
?>
|
||||
<p> <?php echo $strDBComment; ?>
|
||||
<i><?php echo htmlspecialchars(implode(' ', $comment)); ?></i></p>
|
||||
<i><?php echo htmlspecialchars($comment); ?></i></p>
|
||||
<?php
|
||||
} // end if
|
||||
}
|
||||
|
@@ -22,11 +22,9 @@ require_once './libraries/mysql_charsets.lib.php';
|
||||
/**
|
||||
* Rename/move or copy database
|
||||
*/
|
||||
if (strlen($db) &&
|
||||
((isset($db_rename) && $db_rename == 'true') ||
|
||||
(isset($db_copy) && $db_copy == 'true'))) {
|
||||
if (strlen($db) && (! empty($db_rename) || ! empty($db_copy))) {
|
||||
|
||||
if (isset($db_rename) && $db_rename == 'true') {
|
||||
if (! empty($db_rename)) {
|
||||
$move = true;
|
||||
} else {
|
||||
$move = false;
|
||||
@@ -188,8 +186,8 @@ $cfgRelation = PMA_getRelationsParam();
|
||||
* Check if comments were updated
|
||||
* (must be done before displaying the menu tabs)
|
||||
*/
|
||||
if ($cfgRelation['commwork'] && isset($db_comment) && $db_comment == 'true') {
|
||||
PMA_SetComment($db, '', '(db_comment)', $comment);
|
||||
if (isset($_REQUEST['comment'])) {
|
||||
PMA_setDbComment($db, $comment);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -224,23 +222,13 @@ if (!$is_information_schema) {
|
||||
?>
|
||||
<form method="post" action="db_operations.php">
|
||||
<?php echo PMA_generate_common_hidden_inputs($db); ?>
|
||||
<input type="hidden" name="db_comment" value="true" />
|
||||
<fieldset>
|
||||
<legend>
|
||||
<?php
|
||||
if ($cfg['PropertiesIconic']) {
|
||||
echo '<img class="icon" src="' . $pmaThemeImage . 'b_comment.png"'
|
||||
.' alt="" border="0" width="16" height="16" hspace="2" align="middle" />';
|
||||
}
|
||||
echo $strDBComment;
|
||||
$comment = PMA_getComments($db);
|
||||
?>
|
||||
<?php PMA_getIcon('b_comment.png', $strDBComment, false, true); ?>
|
||||
</legend>
|
||||
<input type="text" name="comment" class="textfield" size="30"
|
||||
value="<?php
|
||||
echo (isset($comment) && is_array($comment)
|
||||
? htmlspecialchars(implode(' ', $comment))
|
||||
: ''); ?>" />
|
||||
echo htmlspecialchars(PMA_getDbComment($db)); ?>" />
|
||||
<input type="submit" value="<?php echo $strGo; ?>" />
|
||||
</fieldset>
|
||||
</form>
|
||||
|
@@ -257,7 +257,7 @@ require_once './libraries/List.class.php';
|
||||
* @uses $cfg['LeftFrameDBSeparator']
|
||||
* @uses $cfg['ShowTooltipAliasDB']
|
||||
* @uses PMA_getTableCount()
|
||||
* @uses PMA_getComments()
|
||||
* @uses PMA_getDbComment()
|
||||
* @uses is_array()
|
||||
* @uses implode()
|
||||
* @uses strstr()
|
||||
@@ -275,9 +275,9 @@ require_once './libraries/List.class.php';
|
||||
$db_tooltip = '';
|
||||
if ($GLOBALS['cfg']['ShowTooltip']
|
||||
&& $GLOBALS['cfgRelation']['commwork']) {
|
||||
$_db_tooltip = PMA_getComments($db);
|
||||
if (is_array($_db_tooltip)) {
|
||||
$db_tooltip = implode(' ', $_db_tooltip);
|
||||
$_db_tooltip = PMA_getDbComment($db);
|
||||
if ($_db_tooltip) {
|
||||
$db_tooltip = $_db_tooltip;
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -244,16 +244,15 @@ if (empty($GLOBALS['is_header_sent'])) {
|
||||
// Get additional information about tables for tooltip is done
|
||||
// in libraries/db_info.inc.php only once
|
||||
if ($cfgRelation['commwork']) {
|
||||
$comment = PMA_getComments($GLOBALS['db']);
|
||||
|
||||
$comment = PMA_getDbComment($GLOBALS['db']);
|
||||
/**
|
||||
* Displays table comment
|
||||
*/
|
||||
if (is_array($comment) && ! empty($comment)) {
|
||||
if (! empty($comment)) {
|
||||
echo '<span class="table_comment"'
|
||||
.' id="span_table_comment">"'
|
||||
.htmlspecialchars(implode(' ', $comment))
|
||||
.'"</span>' . "\n";
|
||||
. ' id="span_table_comment">"'
|
||||
. htmlspecialchars($comment)
|
||||
. '"</span>' . "\n";
|
||||
} // end if
|
||||
}
|
||||
}
|
||||
|
@@ -29,7 +29,7 @@
|
||||
* @uses PMA_List_Database::getGroupedDetails()
|
||||
* @uses PMA_generate_common_url()
|
||||
* @uses PMA_generate_common_hidden_inputs()
|
||||
* @uses PMA_getComments();
|
||||
* @uses PMA_getDbComment();
|
||||
* @uses PMA_getTableCount()
|
||||
* @uses PMA_getTableList()
|
||||
* @uses PMA_getRelationsParam()
|
||||
@@ -249,9 +249,9 @@ if ($GLOBALS['cfg']['LeftFrameLight'] && strlen($GLOBALS['db'])) {
|
||||
|
||||
if ($GLOBALS['cfg']['ShowTooltip']
|
||||
&& $GLOBALS['cfgRelation']['commwork']) {
|
||||
$_db_tooltip = PMA_getComments($GLOBALS['db']);
|
||||
if (is_array($_db_tooltip)) {
|
||||
$db_tooltip = implode(' ', $_db_tooltip);
|
||||
$_db_tooltip = PMA_getDbComment($GLOBALS['db']);
|
||||
if ($_db_tooltip) {
|
||||
$db_tooltip = $_db_tooltip;
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -15,7 +15,6 @@
|
||||
* @uses PMA_sqlAddslashes()
|
||||
* @uses PMA_DBI_try_query()
|
||||
* @uses PMA_getRelationsParam()
|
||||
* @uses PMA_setComment()
|
||||
* @uses PMA_setMIME()
|
||||
* @uses PMA_mysqlDie()
|
||||
* @uses PMA_generate_common_url()
|
||||
|
Reference in New Issue
Block a user