Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2013-10-07 12:22:33 +02:00
commit 28231aa51c

View File

@ -400,7 +400,9 @@ class PMA_Index
continue;
}
$html_options .= '<option value="' . $each_index_choice . '"'
. (($this->_choice == $each_index_choice) ? ' selected="selected"' : '')
. (($this->_choice == $each_index_choice)
? ' selected="selected"'
: '')
. '>'. $each_index_choice . '</option>' . "\n";
}
@ -891,6 +893,12 @@ class PMA_Index_Column
return $this->_seq_in_index;
}
/**
* Returns the number of indexed characters if the column is only
* partly indexed
*
* @return int the number of indexed characters
*/
public function getSubPart()
{
return $this->_sub_part;