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

Merge remote-tracking branch 'origin/master' into drizzle

Browse Source
This commit is contained in:
Piotr Przybylski 2011-06-18 00:12:43 +02:00
commit 2444ad6d20
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -33,6 +33,7 @@ phpMyAdmin - ChangeLog
- bug #3315741 [display] Inline query edit broken
- patch #3317206 [privileges] Generate password option missing on new accounts
- bug #3317293 [edit] Inline edit places HTML line breaks in edit area
- bug #3319466 [interface] Inline query edit does not escape special characters
3.4.2.0 (2011-06-07)
- bug #3301249 [interface] Iconic table operations does not remove inline edit label

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 {

7
js/functions.js
View File

@ -1164,7 +1164,12 @@ $(document).ready(function(){
$(".btnSave").each(function(){
$(this).click(function(){
sql_query = $(this).prev().val();
window.location.replace("import.php?db=" + db +"&table=" + table + "&sql_query=" + sql_query + "&show_query=1&token=" + token);
window.location.replace("import.php"
+ "?db=" + encodeURIComponent(db)
+ "&table=" + encodeURIComponent(table)
+ "&sql_query=" + encodeURIComponent(sql_query)
+ "&show_query=1"
+ "&token=" + token);
});
});
$(".btnDiscard").each(function(){

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()