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:
Michal Čihař 2012-04-14 07:12:34 +02:00
commit f494214d92
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
export.php
View File

@ -28,7 +28,9 @@ $export_list = PMA_getPlugins(
'libraries/export/',
array(
'export_type' => $export_type,
'single_table' => isset($single_table)));
'single_table' => isset($single_table)
)
);
// Backward compatbility
$type = $what;

10
navigation.php
View File

@ -604,10 +604,12 @@ function PMA_displayTableList($tables, $visible = false,
$href = $GLOBALS['cfg']['DefaultTabTable'] . '?'
.$GLOBALS['common_url_query'] . '&table='
.urlencode($table['Name']) . '&pos=0';
echo '<a href="' . $href
. '" title="' . htmlspecialchars(PMA_getTitleForTarget($GLOBALS['cfg']['DefaultTabTable']) . ': ' . $table['Comment']
.' (' . PMA_formatNumber($table['Rows'], 0) . ' ' . __('Rows')) . ')"'
.' id="' . htmlspecialchars($table_db . '.' . $table['Name']) . '">'
echo '<a href="' . $href . '" title="'
. htmlspecialchars(
PMA_getTitleForTarget($GLOBALS['cfg']['DefaultTabTable']) . ': ' . $table['Comment']
.' (' . PMA_formatNumber($table['Rows'], 0) . ' ' . __('Rows') . ')'
)
.'" id="' . htmlspecialchars($table_db . '.' . $table['Name']) . '">'
// preserve spaces in table name
. str_replace(' ', '&nbsp;', htmlspecialchars($table['disp_name'])) . '</a>';
echo '</li>' . "\n";