Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChanaka Indrajith <pe.chanaka.ck@gmail.com>2012-06-30 10:00:39 +0400
committerChanaka Indrajith <pe.chanaka.ck@gmail.com>2012-06-30 10:00:39 +0400
commit106265a7f8709d6ac95c8600550197725fea5ba3 (patch)
tree3c00897d9f01d3f5fba8e3ca2d76f6959d32a2a9 /tbl_indexes.php
parent038a81b1a82a05868e65ddf86dab9409aa9ffe17 (diff)
parent3b68252564b755b668c3f4f295da4256b9d26ca4 (diff)
Resolve conflicts
Diffstat (limited to 'tbl_indexes.php')
-rw-r--r--tbl_indexes.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/tbl_indexes.php b/tbl_indexes.php
index 964e141b28..2f5fd72fe2 100644
--- a/tbl_indexes.php
+++ b/tbl_indexes.php
@@ -204,7 +204,7 @@ if ($GLOBALS['is_ajax_request'] != true) {
<strong>
<label for="input_index_name">
<?php echo __('Index name:'); ?>
- <?php echo PMA_showhint(PMA_Message::notice(__(
+ <?php echo PMA_CommonFunctions::getInstance()->showHint(PMA_Message::notice(__(
'("PRIMARY" <b>must</b> be the name of and <b>only of</b> a primary key!)'))); ?>
</label>
</strong>