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 2016-03-22 07:21:48 +01:00
commit 9642caab99
5 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
db_structure.php
View File

@ -28,7 +28,9 @@ list(
) = Util::getDbInfo($GLOBALS['db'], isset($sub_part) ? $sub_part : '');
$container = libraries\di\Container::getDefaultContainer();
$container->factory('PMA\libraries\controllers\database\DatabaseStructureController');
$container->factory(
'PMA\libraries\controllers\database\DatabaseStructureController'
);
$container->alias(
'DatabaseStructureController',
'PMA\libraries\controllers\database\DatabaseStructureController'

3
import.php
View File

@ -110,7 +110,8 @@ if (! empty($sql_query)) {
// apply values for parameters
if (! empty($_REQUEST['parameterized'])
&& ! empty($_REQUEST['parameters'])
&& is_array($_REQUEST['parameters'])) {
&& is_array($_REQUEST['parameters'])
) {
$parameters = $_REQUEST['parameters'];
foreach ($parameters as $parameter => $replacement) {
$quoted = preg_quote($parameter);

3
lint.php
View File

@ -37,7 +37,8 @@ if (! empty($_POST['options'])) {
if (! empty($options['routine_editor'])) {
$sql_query = 'CREATE PROCEDURE `a`() ' . $sql_query;
} elseif (! empty($options['trigger_editor'])) {
$sql_query = 'CREATE TRIGGER `a` AFTER INSERT ON `b` FOR EACH ROW ' . $sql_query;
$sql_query = 'CREATE TRIGGER `a` AFTER INSERT ON `b` FOR EACH ROW '
. $sql_query;
} elseif (! empty($options['event_editor'])) {
$sql_query = 'CREATE EVENT `a` ON SCHEDULE EVERY MINUTE DO ' . $sql_query;
}

2
tbl_export.php
View File

@ -108,7 +108,7 @@ if (! empty($sql_query)) {
),
array(
new SqlParser\Token($table),
new SqlParser\Token('.',SqlParser\Token::TYPE_OPERATOR)
new SqlParser\Token('.', SqlParser\Token::TYPE_OPERATOR)
)
);
}

9
tbl_replace.php
View File

@ -266,10 +266,11 @@ foreach ($loop_array as $rownumber => $where_clause) {
if (! isset($multi_edit_virtual) || ! isset($multi_edit_virtual[$key])) {
list($query_values, $query_fields)
= PMA_getQueryValuesForInsertAndUpdateInMultipleEdit(
$multi_edit_columns_name, $multi_edit_columns_null, $current_value,
$multi_edit_columns_prev, $multi_edit_funcs, $is_insert,
$query_values, $query_fields, $current_value_as_an_array,
$value_sets, $key, $multi_edit_columns_null_prev
$multi_edit_columns_name, $multi_edit_columns_null,
$current_value, $multi_edit_columns_prev, $multi_edit_funcs,
$is_insert, $query_values, $query_fields,
$current_value_as_an_array, $value_sets, $key,
$multi_edit_columns_null_prev
);
}
if (isset($multi_edit_columns_null[$key])) {