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

Fix merge conflicts

Browse Source
This commit is contained in:
Marc Delisle 2011-10-02 07:41:32 -04:00
parent 2c7b06f543
commit 1df108de90
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
server_synchronize.php
View File

@ -1170,7 +1170,10 @@ if (! isset($_REQUEST['submit_connect'])
$databases_to_hide = array(
'information_schema',
'mysql'
);
);
if (PMA_DRIZZLE) {
$databases_to_hide[] = 'data_dictionary';
}
if ($GLOBALS['cfg']['AllowArbitraryServer'] === false) {
$possibly_readonly = ' readonly="readonly"';
@ -1278,23 +1281,22 @@ if (! isset($_REQUEST['submit_connect'])
<td><?php echo __('Database'); ?></td>
<td>
<?php
// these unset() do not complain if the elements do not exist
unset($databases['mysql']);
unset($databases['information_schema']);
if (PMA_DRIZZLE) {
unset($databases['data_dictionary']);
$options_list = '';
foreach ($databases as $array_key => $db) {
if (in_array($db['SCHEMA_NAME'], $databases_to_hide)) {
unset($databases[$array_key]);
} else {
$options_list .= '<option>' . htmlspecialchars($db['SCHEMA_NAME']) . '</option>';
}
}
if (count($databases) == 0) {
echo __('No databases');
} else {
echo '
<select name="' . $type . '_db_sel">
';
foreach ($databases as $db) {
echo ' <option>' . htmlspecialchars($db['SCHEMA_NAME']) . '</option>';
}
echo '</select>';
echo '<select name="' . $type . '_db_sel">'
. $options_list
. '</select>';
unset($options_list);
}
echo '</td> </tr>
</table>';