diff --git a/config.sample.inc.php b/config.sample.inc.php index 575e96562..679555bca 100644 --- a/config.sample.inc.php +++ b/config.sample.inc.php @@ -35,12 +35,6 @@ $cfg['Servers'][$i]['compress'] = false; $cfg['Servers'][$i]['extension'] = 'mysql'; $cfg['Servers'][$i]['AllowNoPassword'] = false; -/* for blobstreaming */ -$cfg['Servers'][$i]['bs_garbage_threshold'] = 50; -$cfg['Servers'][$i]['bs_repository_threshold'] = '32M'; -$cfg['Servers'][$i]['bs_temp_blob_timeout'] = 600; -$cfg['Servers'][$i]['bs_temp_log_threshold'] = '32M'; - /* User for advanced features */ // $cfg['Servers'][$i]['controluser'] = 'pma'; // $cfg['Servers'][$i]['controlpass'] = 'pmapass'; diff --git a/libraries/config.default.php b/libraries/config.default.php index 7ec7c5dc5..28aa85e3b 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -137,12 +137,6 @@ $cfg['Servers'][$i]['connect_type'] = 'tcp'; */ $cfg['Servers'][$i]['extension'] = 'mysql'; -/* added for blobstreaming */ -$cfg['Servers'][$i]['bs_garbage_threshold'] = ''; -$cfg['Servers'][$i]['bs_repository_threshold'] = ''; -$cfg['Servers'][$i]['bs_temp_blob_timeout'] = ''; -$cfg['Servers'][$i]['bs_temp_log_threshold'] = ''; - /** * Use compressed protocol for the MySQL connection (requires PHP >= 4.3.0) * diff --git a/tbl_change.php b/tbl_change.php index d8486ba3c..704cdc13a 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -889,7 +889,7 @@ foreach ($rows as $row_id => $vrow) { if ($is_upload && $field['is_blob']) { // check if field type is of longblob and if the table is PBMS enabled. - if (($field['pma_type'] == "longblob") && PMA_BS_IsTablePBMSEnabled($db_name, $tbl_name, $tbl_type)) { + if (($field['pma_type'] == "longblob") && PMA_BS_IsTablePBMSEnabled($db, $table, $tbl_type)) { echo '
'; echo ' ' . __('Upload to BLOB repository'); }