Permalink
Browse files

Fixes a "duplicate column" issue on install. Thanks to maxmix for rep…

…orting.
  • Loading branch information...
1 parent 1cf781b commit 4576c7a052501783165084c68d7f77949fb2a580 @skarcha committed Aug 20, 2010
Showing with 4 additions and 5 deletions.
  1. +4 −5 bamboo_system_files/application/controllers/install.php
View
9 bamboo_system_files/application/controllers/install.php
@@ -213,7 +213,6 @@ function do_install($admin_email = '', $admin_password = '', $primary_contact =
'invoice_note_default' => array('type' => 'VARCHAR', 'constraint' => 255),
'currency_type' => array('type' => 'VARCHAR', 'constraint' => 20),
'currency_symbol' => array('type' => 'VARCHAR', 'constraint' => 9, 'default' => '$'),
- 'currency_symbol_after' => array('type' => 'CHAR', 'constraint' => 1, 'default' => 'n'),
'tax_code' => array('type' => 'VARCHAR', 'constraint' => 50),
'tax1_desc' => array('type' => 'VARCHAR', 'constraint' => 50),
'tax1_rate' => array('type' => 'FLOAT', 'constraint' => '6,3', 'default' => 0),
@@ -262,7 +261,7 @@ function update_bamboo()
$version = $this->db->get('settings')->row()->bambooinvoice_version;
- if ($version == '0.8.0' OR $version == '0.8.1' OR $version == '0.8.2')
+ if ($version == '0.8.0' OR $version == '0.8.1' OR $version == '0.8.2')
{
show_error('Updating beyond this point requires a newer version of BambooInvoice. Please contact Derek Allard if you want some guidance migrating your data.');
}
@@ -319,7 +318,7 @@ function update_bamboo()
{
$field = array(
'new_version_autocheck' => array(
- 'type' => 'CHAR',
+ 'type' => 'CHAR',
'default' => 'n'
)
);
@@ -520,7 +519,7 @@ function not_installed()
/**
* This function is here to help me clean up the demo from time to time. I STRONGLY recommend you don't use
* it, as it WILL wipe out all your data and recovery will not be possible. Don't do it man... DON'T DO IT!
- */
+ */
/*
function baleeted()
{
@@ -533,7 +532,7 @@ function baleeted()
if (strpos($table, 'settings') === FALSE)
{
$table = str_replace($this->db->dbprefix, '', $table);
- $this->db->truncate($table);
+ $this->db->truncate($table);
}
}

0 comments on commit 4576c7a

Please sign in to comment.