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 2014-12-24 05:49:45 +01:00
commit 0fa99606cf
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -17,6 +17,7 @@ phpMyAdmin - ChangeLog
- bug #4664 select min() displays 1 row, but reports the table amount of rows returned
- bug #4666 Undefined indexes in table stucture print view of a view
- bug #4663 Export missing back ticks for order table name
- bug #4668 Remove from central columns error
4.3.3.0 (2014-12-21)
- bug The "Recently used tables" setting should be with Nav panel

4
libraries/central_columns.lib.php
View File

@ -267,7 +267,6 @@ function PMA_syncUniqueColumns($field_select, $isTable=true, $table=null)
), htmlspecialchars($existingCols)
)
);
$message->addMessage('<br /><br />');
$message->addMessage(
PMA_Message::notice(
"Please remove them first "
@ -280,7 +279,6 @@ function PMA_syncUniqueColumns($field_select, $isTable=true, $table=null)
foreach ($insQuery as $query) {
if (!$GLOBALS['dbi']->tryQuery($query, $GLOBALS['controllink'])) {
$message = PMA_Message::error(__('Could not add columns!'));
$message->addMessage('<br /><br />');
$message->addMessage(
PMA_Message::rawError(
$GLOBALS['dbi']->getError($GLOBALS['controllink'])
@ -310,7 +308,7 @@ function PMA_deleteColumnsFromList($field_select, $isTable=true)
if (empty($cfgCentralColumns)) {
return PMA_configErrorMessage();
}
$db = $_POST['db'];
$db = $_REQUEST['db'];
$pmadb = $cfgCentralColumns['db'];
$central_list_table = $cfgCentralColumns['table'];
$GLOBALS['dbi']->selectDb($db, $GLOBALS['userlink']);