Fixed the upgrade from 1.6.x. The role->shortname field was not being created.

diff --git a/lib/db/mysql.php b/lib/db/mysql.php
index 9a168cf0c1bf4e9e66bf6b33a57790a4ba826767..6c5e79338e2cf27aa7fb3126c2d7bdc224d2a927 100644 (file)
--- a/lib/db/mysql.php
+++ b/lib/db/mysql.php
@@ -2005,6 +2005,7 @@ function main_upgrade($oldversion=0) {
         execute_sql("CREATE TABLE {$CFG->prefix}role (
                               `id` int(10) unsigned NOT NULL auto_increment,
                               `name` varchar(255) NOT NULL default '',
+                              `shortname` varchar(100) NOT NULL default '',
                               `description` text NOT NULL default '',
                               `sortorder` int(10) unsigned NOT NULL default '0',
                               PRIMARY KEY  (`id`)

diff --git a/lib/db/postgres7.php b/lib/db/postgres7.php
index 56f6b4c709322d8e66e9e8e4e9750a502e800290..348fba09214ea8ed51d858741a674a9ea9561733 100644 (file)
--- a/lib/db/postgres7.php
+++ b/lib/db/postgres7.php
@@ -1622,6 +1622,7 @@ function main_upgrade($oldversion=0) {
          modify_database('', "CREATE TABLE prefix_role (
                                   id SERIAL PRIMARY KEY,
                                   name varchar(255) NOT NULL default '',
+                                  shortname varchar(100) NOT NULL default '',     
                                   description text NOT NULL default '',
                                   sortorder integer NOT NULL default '0'
                                 );");