diff --git a/libraries/classes/Config/Descriptions.php b/libraries/classes/Config/Descriptions.php index ff0750f718f3..46c06f7fa24e 100644 --- a/libraries/classes/Config/Descriptions.php +++ b/libraries/classes/Config/Descriptions.php @@ -627,6 +627,10 @@ public static function getString($path, $type = 'name') . 'This might be a good way to import large files, however it can break ' . 'transactions.' ); + case 'Import_enable_drag_drop_import_name': + return __('Enable drag and drop import'); + case 'Import_enable_drag_drop_import_desc': + return __('Uncheck the checkbox to disable drag and drop import'); case 'Import_allow_interrupt_name': return __('Partial import: allow interrupt'); case 'Import_charset_name': diff --git a/libraries/classes/Config/Forms/User/ImportForm.php b/libraries/classes/Config/Forms/User/ImportForm.php index 065889604eff..592a9fe80209 100644 --- a/libraries/classes/Config/Forms/User/ImportForm.php +++ b/libraries/classes/Config/Forms/User/ImportForm.php @@ -27,7 +27,8 @@ public static function getForms() 'Import/format', 'Import/charset', 'Import/allow_interrupt', - 'Import/skip_queries' + 'Import/skip_queries', + 'Import/enable_drag_drop_import' ], 'Sql' => [ 'Import/sql_compatibility', diff --git a/libraries/classes/Navigation/Navigation.php b/libraries/classes/Navigation/Navigation.php index e60d6cff887b..da7d030dff9f 100644 --- a/libraries/classes/Navigation/Navigation.php +++ b/libraries/classes/Navigation/Navigation.php @@ -83,7 +83,9 @@ public function getDisplay() } $retval .= ''; //pma_navi_settings_container $retval .= ''; // pma_navigation_content - $retval .= $this->_getDropHandler(); + if($GLOBALS['cfg']['Import']['enable_drag_drop_import'] === true) { //load drag drop handler only if configuration setting is set to true + $retval .= $this->_getDropHandler(); + } $retval .= ''; // pma_navigation } diff --git a/libraries/config.default.php b/libraries/config.default.php index bf62018660a8..31a8bf5d28b8 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -2179,6 +2179,14 @@ */ $cfg['Import']['allow_interrupt'] = true; +/** + * Enable drag and drop import + * @see feature request : https://github.com/phpmyadmin/phpmyadmin/issues/13155 + * + * @global bool $cfg['Import']['enable_drag_drop_import'] + */ +$cfg['Import']['enable_drag_drop_import'] = true; + /** * *