Merge remote-tracking branch 'upstream/dev' into bs_5_fixes

application/config/migration.php

@@ -22,7 +22,7 @@ $config['migration_enabled'] = TRUE;
 |
 */
 
-$config['migration_version'] = 158;
+$config['migration_version'] = 159;
 
 /*
 |--------------------------------------------------------------------------

application/migrations/158_add_qrz_down.php

@@ -6,10 +6,10 @@ class Migration_add_qrz_down extends CI_Migration
 	public function up() {
                 if (!$this->db->field_exists('COL_QRZCOM_QSO_DOWNLOAD_STATUS', $this->config->item('table_name'))) {
                         $fields = array(
-                                'COL_QRZCOM_QSO_DOWNLOAD_DATE DATETIME NULL DEFAULT NULL',
-                                'COL_QRZCOM_QSO_DOWNLOAD_STATUS VARCHAR(10) DEFAULT NULL',
+                                'COLUMN COL_QRZCOM_QSO_DOWNLOAD_DATE DATETIME NULL DEFAULT NULL',
+                                'COLUMN COL_QRZCOM_QSO_DOWNLOAD_STATUS VARCHAR(10) DEFAULT NULL',
                         );
-                        $this->dbforge->add_column($this->config->item('table_name'), $fields, 'COL_VUCC_GRIDS');
+                        $this->dbforge->add_column($this->config->item('table_name'), $fields);
 		}
 	}
 

application/migrations/159_extend_default_qsl.php

@@ -0,0 +1,11 @@
+<?php
+
+// Create migration that makes the submode column in the logbook table an index
+class Migration_extend_default_qsl  extends CI_Migration {
+
+    public function up() {
+        $this->db->query("ALTER TABLE `users` CHANGE COLUMN `user_default_confirmation` `user_default_confirmation` VARCHAR(4) NULL DEFAULT NULL");
+    }
+}
+
+?>