Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2014-06-24 14:45:10 +02:00
commit 98dec51672

View File

@ -98,7 +98,7 @@ function PMA_getHtmlForImportJS($upload_id)
*
* @return string
*/
function PMA_getHtmlForExportOptions($import_type, $db, $table)
function PMA_getHtmlForImportOptions($import_type, $db, $table)
{
$html = ' <div class="exportoptions" id="header">';
$html .= ' <h2>';
@ -413,7 +413,7 @@ function PMA_getHtmlForImport(
$html .= PMA_getHtmlForHiddenInputs($import_type, $db, $table);
$html .= PMA_getHtmlForExportOptions($import_type, $db, $table);
$html .= PMA_getHtmlForImportOptions($import_type, $db, $table);
$html .= PMA_getHtmlForImportOptionsFile($max_upload_size, $import_list);