Merge branch 'QA_4_7'
This commit is contained in:
Michal Čihař
commit
f563880af4
@ -27,6 +27,7 @@ phpMyAdmin - ChangeLog
|
||||
|
||||
4.7.3 (not yet released)
|
||||
- issue #13447 Large multi-line query removes Export operation and blanks query box options
|
||||
- issue #13445 Fixed rendering of query results
|
||||
|
||||
4.7.2 (2017-06-29)
|
||||
- issue #13314 Make theme selection keep current server
|
||||
|
||||
@ -1066,18 +1066,18 @@ class Util
|
||||
$explain_params = $url_params;
|
||||
if ($is_select) {
|
||||
$explain_params['sql_query'] = 'EXPLAIN ' . $sql_query;
|
||||
$explain_link = ' ['
|
||||
$explain_link = ' [ '
|
||||
. self::linkOrButton(
|
||||
'import.php' . Url::getCommon($explain_params),
|
||||
__('Explain SQL')
|
||||
) . ']';
|
||||
) . ' ]';
|
||||
} elseif (preg_match(
|
||||
'@^EXPLAIN[[:space:]]+SELECT[[:space:]]+@i',
|
||||
$sql_query
|
||||
)) {
|
||||
$explain_params['sql_query']
|
||||
= mb_substr($sql_query, 8);
|
||||
$explain_link = ' ['
|
||||
$explain_link = ' [ '
|
||||
. self::linkOrButton(
|
||||
'import.php' . Url::getCommon($explain_params),
|
||||
__('Skip Explain SQL')
|
||||
@ -1093,7 +1093,7 @@ class Util
|
||||
true,
|
||||
false,
|
||||
'_blank'
|
||||
) . ']';
|
||||
) . ' ]';
|
||||
}
|
||||
} //show explain
|
||||
|
||||
@ -1106,9 +1106,9 @@ class Util
|
||||
&& empty($GLOBALS['show_as_php'])
|
||||
) {
|
||||
$edit_link .= Url::getCommon($url_params) . '#querybox';
|
||||
$edit_link = ' ['
|
||||
$edit_link = ' [ '
|
||||
. self::linkOrButton($edit_link, __('Edit'))
|
||||
. ']';
|
||||
. ' ]';
|
||||
} else {
|
||||
$edit_link = '';
|
||||
}
|
||||
@ -1118,7 +1118,7 @@ class Util
|
||||
if (! empty($cfg['SQLQuery']['ShowAsPHP']) && ! $query_too_big) {
|
||||
|
||||
if (! empty($GLOBALS['show_as_php'])) {
|
||||
$php_link = ' ['
|
||||
$php_link = ' [ '
|
||||
. self::linkOrButton(
|
||||
'import.php' . Url::getCommon($url_params),
|
||||
__('Without PHP code'),
|
||||
@ -1128,9 +1128,9 @@ class Util
|
||||
'',
|
||||
true
|
||||
)
|
||||
. ']';
|
||||
. ' ]';
|
||||
|
||||
$php_link .= ' ['
|
||||
$php_link .= ' [ '
|
||||
. self::linkOrButton(
|
||||
'import.php' . Url::getCommon($url_params),
|
||||
__('Submit query'),
|
||||
@ -1140,17 +1140,17 @@ class Util
|
||||
'',
|
||||
true
|
||||
)
|
||||
. ']';
|
||||
. ' ]';
|
||||
} else {
|
||||
$php_params = $url_params;
|
||||
$php_params['show_as_php'] = 1;
|
||||
$_message = __('Create PHP code');
|
||||
$php_link = ' ['
|
||||
$php_link = ' [ '
|
||||
. self::linkOrButton(
|
||||
'import.php' . Url::getCommon($php_params),
|
||||
$_message
|
||||
)
|
||||
. ']';
|
||||
. ' ]';
|
||||
}
|
||||
} else {
|
||||
$php_link = '';
|
||||
@ -1162,7 +1162,7 @@ class Util
|
||||
&& preg_match('@^(SELECT|SHOW)[[:space:]]+@i', $sql_query)
|
||||
) {
|
||||
$refresh_link = 'import.php' . Url::getCommon($url_params);
|
||||
$refresh_link = ' ['
|
||||
$refresh_link = ' [ '
|
||||
. self::linkOrButton($refresh_link, __('Refresh')) . ']';
|
||||
} else {
|
||||
$refresh_link = '';
|
||||
@ -1824,9 +1824,9 @@ class Util
|
||||
}
|
||||
|
||||
// no whitespace within an <a> else Safari will make it part of the link
|
||||
$ret = ' <a href="' . $url . '" '
|
||||
$ret = '<a href="' . $url . '" '
|
||||
. implode(' ', $tag_params_strings) . '>'
|
||||
. $message . $displayed_message . '</a> ';
|
||||
. $message . $displayed_message . '</a>';
|
||||
} else {
|
||||
// no spaces (line breaks) at all
|
||||
// or after the hidden fields
|
||||
|
||||
@ -435,13 +435,13 @@ class DisplayResultsTest extends PMATestCase
|
||||
'`customer`.`id` = 1',
|
||||
'%60customer%60.%60id%60+%3D+1',
|
||||
'<td class="klass edit_row_anchor center print_ignore" >'
|
||||
. '<span class="nowrap"> '
|
||||
. '<span class="nowrap">'
|
||||
. '<a href="tbl_change.php?db=Data&table=customer&where_'
|
||||
. 'clause=%60customer%60.%60id%60+%3D+1&clause_is_unique=1&'
|
||||
. 'sql_query=SELECT+%2A+FROM+%60customer%60&goto=sql.php&'
|
||||
. 'default_action=update"'
|
||||
. ' ><span class="nowrap"><img src="themes/dot.gif" title="Edit" '
|
||||
. 'alt="Edit" class="icon ic_b_edit" /> Edit</span></a> '
|
||||
. 'alt="Edit" class="icon ic_b_edit" /> Edit</span></a>'
|
||||
. '<input type="hidden" class="where_clause" value ="%60customer'
|
||||
. '%60.%60id%60+%3D+1" /></span></td>'
|
||||
)
|
||||
@ -498,13 +498,13 @@ class DisplayResultsTest extends PMATestCase
|
||||
'%60customer%60.%60id%60+%3D+1',
|
||||
'klass',
|
||||
'<td class="klass center print_ignore" ><span class='
|
||||
. '"nowrap"> '
|
||||
. '"nowrap">'
|
||||
. '<a href="tbl_change.php?db=Data&table=customer&where_'
|
||||
. 'clause=%60customer%60.%60id%60+%3D+1&clause_is_unique=1&'
|
||||
. 'sql_query=SELECT+%2A+FROM+%60customer%60&goto=sql.php&'
|
||||
. 'default_action=insert"'
|
||||
. ' ><span class="nowrap"><img src="themes/dot.gif" title="Copy" '
|
||||
. 'alt="Copy" class="icon ic_b_insrow" /> Copy</span></a> '
|
||||
. 'alt="Copy" class="icon ic_b_insrow" /> Copy</span></a>'
|
||||
. '<input type="hidden" class="where_clause" value="%60customer%60'
|
||||
. '.%60id%60+%3D+1" /></span></td>'
|
||||
)
|
||||
@ -561,7 +561,7 @@ class DisplayResultsTest extends PMATestCase
|
||||
. 'alt="Delete" class="icon ic_b_drop" /> Delete</span>',
|
||||
'DELETE FROM `Data`.`customer` WHERE `customer`.`id` = 1',
|
||||
'klass',
|
||||
'<td class="klass center print_ignore" > '
|
||||
'<td class="klass center print_ignore" >'
|
||||
. '<a href="sql.php?db=Data&table=customer&sql_query=DELETE'
|
||||
. '+FROM+%60Data%60.%60customer%60+WHERE+%60customer%60.%60id%60+%3D'
|
||||
. '+1&message_to_show=The+row+has+been+deleted&goto=sql.php'
|
||||
@ -570,7 +570,7 @@ class DisplayResultsTest extends PMATestCase
|
||||
. 'been%2Bdeleted%26goto%3Dtbl_structure.php" '
|
||||
. 'class="delete_row requireConfirm"><span class="nowrap"><img src="themes/dot.'
|
||||
. 'gif" title="Delete" alt="Delete" class="icon ic_b_drop" /> '
|
||||
. 'Delete</span></a> '
|
||||
. 'Delete</span></a>'
|
||||
. '<div class="hide">DELETE FROM `Data`.`customer` WHERE '
|
||||
. '`customer`.`id` = 1</div></td>'
|
||||
)
|
||||
@ -657,24 +657,24 @@ class DisplayResultsTest extends PMATestCase
|
||||
. 'value="%60new%60.%60id%60+%3D+1" /><input type="hidden" class='
|
||||
. '"condition_array" value="{"`new`.`id`":"= 1"'
|
||||
. '}" /> </td><td class="edit_row_anchor center print_ignore" ><span class='
|
||||
. '"nowrap"> '
|
||||
. '"nowrap">'
|
||||
. '<a href="tbl_change.php?db=data&table=new&where_'
|
||||
. 'clause=%60new%60.%60id%60+%3D+1&clause_is_unique=1&'
|
||||
. 'sql_query=SELECT+%2A+FROM+%60new%60&goto=sql.php&default'
|
||||
. '_action=update" >'
|
||||
. '<span class="nowrap"><img src="themes/dot.gif" title="Edit" '
|
||||
. 'alt="Edit" class="icon ic_b_edit" /> Edit</span></a> '
|
||||
. 'alt="Edit" class="icon ic_b_edit" /> Edit</span></a>'
|
||||
. '<input type="hidden" class="where_clause" value ="%60new%60.%60'
|
||||
. 'id%60+%3D+1" /></span></td><td class="center print_ignore" ><span class'
|
||||
. '="nowrap"> '
|
||||
. '="nowrap">'
|
||||
. '<a href="tbl_change.php?db=data&table=new&where_clause'
|
||||
. '=%60new%60.%60id%60+%3D+1&clause_is_unique=1&sql_query='
|
||||
. 'SELECT+%2A+FROM+%60new%60&goto=sql.php&default_action='
|
||||
. 'insert" ><span class'
|
||||
. '="nowrap"><img src="themes/dot.gif" title="Copy" alt="Copy" '
|
||||
. 'class="icon ic_b_insrow" /> Copy</span></a> '
|
||||
. 'class="icon ic_b_insrow" /> Copy</span></a>'
|
||||
. '<input type="hidden" class="where_clause" value="%60new%60.%60id'
|
||||
. '%60+%3D+1" /></span></td><td class="center print_ignore" > '
|
||||
. '%60+%3D+1" /></span></td><td class="center print_ignore" >'
|
||||
. '<a href="sql.php?db=data&table=new&sql_query=DELETE+'
|
||||
. 'FROM+%60data%60.%60new%60+WHERE+%60new%60.%60id%60+%3D+1&'
|
||||
. 'message_to_show=The+row+has+been+deleted&goto=sql.php%3F'
|
||||
@ -683,7 +683,7 @@ class DisplayResultsTest extends PMATestCase
|
||||
. 'deleted%26goto%3Dtbl_structure.php" '
|
||||
. 'class="delete_row requireConfirm"><span class="nowrap"><img src="themes/dot.'
|
||||
. 'gif" title="Delete" alt="Delete" class="icon ic_b_drop" /> '
|
||||
. 'Delete</span></a> '
|
||||
. 'Delete</span></a>'
|
||||
. '<div class="hide">DELETE FROM `data`.`new` WHERE `new`.`id` = 1'
|
||||
. '</div></td>'
|
||||
),
|
||||
@ -724,7 +724,7 @@ class DisplayResultsTest extends PMATestCase
|
||||
'<span class="nowrap"><img src="themes/dot.gif" title="Delete" '
|
||||
. 'alt="Delete" class="icon ic_b_drop" /> Delete</span>',
|
||||
'DELETE FROM `data`.`new` WHERE `new`.`id` = 1',
|
||||
'<td class="center print_ignore" > '
|
||||
'<td class="center print_ignore" >'
|
||||
. '<a href="sql.php?db=data&table=new&sql_query=DELETE+'
|
||||
. 'FROM+%60data%60.%60new%60+WHERE+%60new%60.%60id%60+%3D+1&'
|
||||
. 'message_to_show=The+row+has+been+deleted&goto=sql.php%3Fdb'
|
||||
@ -733,23 +733,23 @@ class DisplayResultsTest extends PMATestCase
|
||||
. '%26goto%3Dtbl_structure.php" class="delete'
|
||||
. '_row requireConfirm"><span class="nowrap"><img src="themes/dot.gif" title='
|
||||
. '"Delete" alt="Delete" class="icon ic_b_drop" /> Delete</span></a>'
|
||||
. ' <div class="hide">DELETE FROM `data`.`new` WHERE `new`.'
|
||||
. '<div class="hide">DELETE FROM `data`.`new` WHERE `new`.'
|
||||
. '`id` = 1</div></td><td class="center print_ignore" ><span class="nowrap">'
|
||||
. ' <a href="tbl_change.php?db=data&table=new&where_'
|
||||
. '<a href="tbl_change.php?db=data&table=new&where_'
|
||||
. 'clause=%60new%60.%60id%60+%3D+1&clause_is_unique=1&sql_'
|
||||
. 'query=SELECT+%2A+FROM+%60new%60&goto=sql.php&default_'
|
||||
. 'action=insert" ><span '
|
||||
. 'class="nowrap"><img src="themes/dot.gif" title="Copy" alt="Copy" '
|
||||
. 'class="icon ic_b_insrow" /> Copy</span></a> '
|
||||
. 'class="icon ic_b_insrow" /> Copy</span></a>'
|
||||
. '<input type="hidden" class="where_clause" value="%60new%60.%60id'
|
||||
. '%60+%3D+1" /></span></td><td class="edit_row_anchor center print_ignore" >'
|
||||
. '<span class="nowrap"> '
|
||||
. '<span class="nowrap">'
|
||||
. '<a href="tbl_change.php?db=data&table=new&where_clause'
|
||||
. '=%60new%60.%60id%60+%3D+1&clause_is_unique=1&sql_query='
|
||||
. 'SELECT+%2A+FROM+%60new%60&goto=sql.php&default_action='
|
||||
. 'update" ><span class='
|
||||
. '"nowrap"><img src="themes/dot.gif" title="Edit" alt="Edit" class'
|
||||
. '="icon ic_b_edit" /> Edit</span></a> '
|
||||
. '="icon ic_b_edit" /> Edit</span></a>'
|
||||
. '<input type="hidden" class="where_clause" value ="%60new%60.%60'
|
||||
. 'id%60+%3D+1" /></span></td><td class="center print_ignore"><input type='
|
||||
. '"checkbox" id="id_rows_to_delete0_right" name="rows_to_delete'
|
||||
|
||||
Loading…
Reference in New Issue
Block a user
