[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5889-gec9a60f

[Marc Delisle]

The branch, master has been updated
       via  ec9a60f8e09463ea34cdd11849b4c2357c4351e5 (commit)
      from  56ebe05af73115e9c6928beb49db846fbbda460a (commit)


- Log -----------------------------------------------------------------
commit ec9a60f8e09463ea34cdd11849b4c2357c4351e5
Author: Marc Delisle <marc at infomarc.info>
Date:   Thu Jul 22 13:22:30 2010 -0400

    undefined variables; unneeded config variables

-----------------------------------------------------------------------

Summary of changes:
 config.sample.inc.php        |    6 ------
 libraries/config.default.php |    6 ------
 tbl_change.php               |    2 +-
 3 files changed, 1 insertions(+), 13 deletions(-)

diff --git a/config.sample.inc.php b/config.sample.inc.php
index 575e965..679555b 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 7ec7c5d..28aa85e 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 d8486ba..704cdc1 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 '<br />';
                     echo '<input type="checkbox" name="upload_blob_repo_' . $field['Field_md5'] . $vkey . '" /> ' .  __('Upload to BLOB repository');
                 }


hooks/post-receive
-- 
phpMyAdmin