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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Pootle server 2011-06-18 00:40:05 +02:00
commit 9a09615be8
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db_qbe.php
View File

@ -759,7 +759,7 @@ if (isset($Field) && count($Field) > 0) {
while ($ind = PMA_DBI_fetch_assoc($ind_rs)) {
$col1 = $tab . '.' . $ind['Column_name'];
if (isset($col_all[$col1])) {
if ($ind['non_unique'] == 0) {
if ($ind['Non_unique'] == 0) {
if (isset($col_where[$col1])) {
$col_unique[$col1] = 'Y';
} else {

10
libraries/Index.class.php
View File

@ -504,7 +504,7 @@ class PMA_Index
$r .= '</td>';
$r .= '<td>' . htmlspecialchars($column->getCardinality()) . '</td>';
$r .= '<td>' . htmlspecialchars($column->getCollation()) . '</td>';
$r .= '<td>' . htmlspecialchars($column->getNull()) . '</td>';
$r .= '<td>' . htmlspecialchars($column->getNull(true)) . '</td>';
if ($column->getSeqInIndex() == 1) {
$r .= '<td ' . $row_span . '>'
@ -635,7 +635,7 @@ class PMA_Index_Column
*
* @var integer
*/
protected $_cardinality = 0;
protected $_cardinality = null;
public function __construct($params = array())
{
@ -679,9 +679,11 @@ class PMA_Index_Column
return $this->_cardinality;
}
public function getNull()
public function getNull($as_text = false)
{
return $this->_null;
return $as_text
? (!$this->_null || $this->_null == 'NO' ? __('No') : __('Yes'))
: $this->_null;
}
public function getSeqInIndex()