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:
Weblate 2013-04-14 15:58:08 +02:00
commit 70a9ad2a42
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -106,6 +106,8 @@ underscore
- bug #3865 Using like operator on each backslash needs 4 backslash protection
- bug #3860 Displayed git revision info is not set
- bug #3871 Check referential integrity broken across databases
- bug #3874 [export] No preselected option when exporting table
- bug #3873 Can't copy table to target database if table exists there
3.5.9.0 (not yet released)

4
libraries/Table.class.php
View File

@ -840,8 +840,8 @@ class PMA_Table
$sql_structure = PMA_SQP_formatHtml($parsed_sql, 'query_only');
// If table exists, and 'add drop table' is selected: Drop it!
$drop_query = '';
if (isset($GLOBALS['drop_if_exists'])
&& $GLOBALS['drop_if_exists'] == 'true'
if (isset($_REQUEST['drop_if_exists'])
&& $_REQUEST['drop_if_exists'] == 'true'
) {
if (PMA_Table::isView($target_db, $target_table)) {
$drop_query = 'DROP VIEW';

2
libraries/display_export.lib.php
View File

@ -187,7 +187,7 @@ if (strlen($table) && ! isset($num_tables) && ! PMA_Table::isMerge($db, $table))
echo '</li>';
echo '<li>';
echo '<input type="radio" name="allrows" value="1" id="radio_allrows_1"';
if (isset($_GET['allrows']) && $_GET['allrows'] == 1) {
if (! isset($_GET['allrows']) || $_GET['allrows'] == 1) {
echo ' checked="checked"';
}
echo '/>';

14
libraries/operations.lib.php
View File

@ -541,11 +541,11 @@ function PMA_handleTheViews($views, $move, $db)
$_error = false;
// temporarily force to add DROP IF EXIST to CREATE VIEW query,
// to remove stand-in VIEW that was created earlier
// ( $GLOBALS['drop_if_exists'] is used in moveCopy() )
if (isset($GLOBALS['drop_if_exists'])) {
$temp_drop_if_exists = $GLOBALS['drop_if_exists'];
// ( $_REQUEST['drop_if_exists'] is used in moveCopy() )
if (isset($_REQUEST['drop_if_exists'])) {
$temp_drop_if_exists = $_REQUEST['drop_if_exists'];
}
$GLOBALS['drop_if_exists'] = 'true';
$_REQUEST['drop_if_exists'] = 'true';
foreach ($views as $view) {
$copying_succeeded = PMA_Table::moveCopy(
@ -556,10 +556,10 @@ function PMA_handleTheViews($views, $move, $db)
break;
}
}
unset($GLOBALS['drop_if_exists']);
unset($_REQUEST['drop_if_exists']);
if (isset($temp_drop_if_exists)) {
// restore previous value
$GLOBALS['drop_if_exists'] = $temp_drop_if_exists;
$_REQUEST['drop_if_exists'] = $temp_drop_if_exists;
}
return $_error;
}
@ -625,7 +625,7 @@ function PMA_getHtmlForOrderTheTable($columns)
. 'value="' . htmlspecialchars($fieldname['Field']) . '">'
. htmlspecialchars($fieldname['Field']) . '</option>' . "\n";
}
$html_output .= '</select> ' . __('(singly)')
$html_output .= '</select> ' . __('(singly)') . ' '
. '<select name="order_order">'
. '<option value="asc">' . __('Ascending') . '</option>'
. '<option value="desc">' . __('Descending') . '</option>'