Updated update.html

diff --git a/includes/prefs/userprefs.inc b/includes/prefs/userprefs.inc
index 76f82696aa9ffe3ac403af2e7be16a439385c7e8..c33220cf84fa76ed473063d5b847a45815a193b7 100644 (file)
--- a/includes/prefs/userprefs.inc
+++ b/includes/prefs/userprefs.inc
@@ -70,8 +70,16 @@ class user_prefs
                        $this->rep_popup = $user["rep_popup"];
                        $this->query_size = $user["query_size"];
                        $this->graphic_links = $user["graphic_links"];
-                       $this->sticky_date = $user["sticky_doc_date"];
-                       $this->startup_tab = $user['startup_tab'];
+                       if (isset($user["sticky_doc_date"]))
+                       {
+                               $this->sticky_date = $user["sticky_doc_date"];
+                               $this->startup_tab = $user['startup_tab'];
+                       }
+                       else
+                       {
+                               $this->sticky_date = 0;
+                               $this->startup_tab = "orders";
+                       }
                }
        }
 

diff --git a/sql/alter2.2.php b/sql/alter2.2.php
index 386e9623ec7d861d4919acd18d48cb219fe6fce1..091e8860f9284c8631ce1107e66cb80f3db94524 100644 (file)
--- a/sql/alter2.2.php
+++ b/sql/alter2.2.php
@@ -28,7 +28,7 @@ class fa2_2 {
        {
                global $db, $systypes_array;
                
-               if (!$preconf)
+               if (!$this->preconf)
                        return false;
                
                // set item category dflt accounts to values from company GL setup

diff --git a/update.html b/update.html
index aee0b22b0f80647f9f18d32bf2018aba1d2b2ecf..eb240de28913ebc1c7edad3c1ded62f9f32352fc 100644 (file)
--- a/update.html
+++ b/update.html
@@ -45,7 +45,10 @@ the new file</em>.
 process earlier). </li>
     </ol>
   </li><li><strong>When
-updating release&nbsp;2.1.X to release 2.2.X, you must immediately
+updating release&nbsp;2.1.X to release 2.2.X, you should first restore
+your $security_headers and $security_groups from your old config.php
+file, alternative unmark them in the new config.php. There is a new
+access_level system in 2.2.</strong></li><li><strong>Then you must immediately
 login on company 0, the first company you created, as&nbsp;admin
 (called the superadmin). If you use a theme other than the standard 3,
 aqua, cool or default, switch to one of these before going further. You
@@ -53,7 +56,7 @@ can download a new one of the new themes on the download page.&nbsp; Go
 to the 'Setup' tab and run 'Software
 Upgrade'.
 Mark the checkbox 'Install' and press 'Upgrade System'. &nbsp;This will
-upgrade ALL your companies.</strong></li><li style="font-weight: bold;">If something goes wrong during upgrade, you can enter here again and try 'Force Upgrade', and press 'Upgrade System' again.</li><li><strong style="font-weight: bold;"></strong><strong>There are no database changes during a major and minor release. Like from 2.2 to 2.2.1 - 2.2.X .</strong></li><li style="font-weight: bold;">Enter
+upgrade ALL your companies.</strong></li><li style="font-weight: bold;">If something goes wrong during upgrade, you can enter here again and try 'Force Upgrade', and press 'Upgrade System' again.</li><li style="font-weight: bold;">Now you should comment your old $securityheaders and $security_groups.</li><li><strong style="font-weight: bold;"></strong><strong>There are no database changes during a major and minor release. Like from 2.2 to 2.2.1 - 2.2.X .</strong></li><li style="font-weight: bold;">Enter
 'Setup' tab, 'System and Generel GL Setup'. &nbsp;Set the correct
 Accounts for Retained Earnings, Profit/Loss Year and Bank Charge.</li><li style="font-weight: bold;">Enter
 'Setup' tab, 'Access Setup'. Check all the roles and change as you