Aiding further with upgrade issuses.

diff --git a/htdocs/cgi-bin/login_ctr.cgi b/htdocs/cgi-bin/login_ctr.cgi
index 4051133d93568eb672e6eaf6748dab54312d0d4b..0bb9827dc675221af7066b1f0cf21031f78e14aa 100755 (executable)
--- a/htdocs/cgi-bin/login_ctr.cgi
+++ b/htdocs/cgi-bin/login_ctr.cgi
@@ -206,7 +206,7 @@ sub checkCreateTables {
         #perl 5.28+ <--
         #if ( 'RTF' ~~ @names ) {
         if(grep( /RTF/, @names)){
-            #$db->begin_work();
+            $db->do('DROP TABLE life_log_login_ctr_temp_table;') if($curr_tables{'life_log_login_ctr_temp_table'});
             $db->do('CREATE TABLE life_log_login_ctr_temp_table AS SELECT * FROM LOG;');
             my %notes_ids = ();
             if($hasNotesTbl){

diff --git a/htdocs/cgi-bin/system/modules/Settings.pm b/htdocs/cgi-bin/system/modules/Settings.pm
index 39f6b857350572f21239fa7de1781251c184c9fc..46dfbe84f833ba786df0bd96086ba8cd9df55924 100644 (file)
--- a/htdocs/cgi-bin/system/modules/Settings.pm
+++ b/htdocs/cgi-bin/system/modules/Settings.pm
@@ -231,7 +231,7 @@ sub selectRecords {
                 return 0 if(!$pst);
                 return $pst;
     }catch{
-                SettingsException->throw(error=>"Database error encountered.", show_trace=>$DEBUG);
+                SettingsException->throw(error=>"Database error encountered. Settings::selectRecords[sql]", show_trace=>$DEBUG);
     };
 }