System preferences moved form company to new sys_prefs table

[fa-stable.git] / sql / alter2.3.php

diff --git a/sql/alter2.3.php b/sql/alter2.3.php
index 07e84e44a2f49f0c5cdb09001332c94f6940b9a5..338729246b9da887d7f6049f835aeed4cbc4183f 100644 (file)
--- a/sql/alter2.3.php
+++ b/sql/alter2.3.php
@@ -26,7 +26,10 @@ class fa2_3 {
        //
        function install($pref, $force) 
        {
-               return true;
+               // remove old prefereces table after upgrade script has been executed
+               $sql = "DROP TABLE IF EXISTS `".$pref."company`";
+
+               return db_query($sql) && update_company_prefs(array('version_id'=>'2.3'));
        }
        //
        //      Checking before install
@@ -39,10 +42,11 @@ class fa2_3 {
        //      Test if patch was applied before.
        //
        function installed($pref) {
-               $n = 1; // number of patches to be installed
+               $n = 2; // number of patches to be installed
                $patchcnt = 0;
 
                if (!check_table($pref, 'comments', 'type', array('Key'=>'MUL'))) $patchcnt++;
+               if (!check_table($pref, 'sys_prefs')) $patchcnt++;
 
                $n -= $patchcnt;
                return $n == 0 ? true : $patchcnt;