Merge branch 'bug/refreshObj' into dev

2 files changed, 15 insertions, 1 deletions

diff --git a/app/class/stage.class.php b/app/class/stage.class.php
index 760a9a2..74c5f42 100644
--- a/app/class/stage.class.php
+++ b/app/class/stage.class.php
@@ -152,7 +152,9 @@ class stage extends object
         if (!($prev = $this->getPrev()))
             return false;
 
-        return $prev->moveForward();
+        $ret = $prev->moveForward();
+        $this->refreshObj();
+        return $ret;
     }
 
     /*
diff --git a/app/class/table.class.php b/app/class/table.class.php
index 45be8c5..c547e43 100644
--- a/app/class/table.class.php
+++ b/app/class/table.class.php
@@ -68,6 +68,15 @@ abstract class table
     }
 
     /*
+     * This function uses loadObj to re-initialize this object, if in
+     * the case it gets modified in another scope.
+     */
+    public function refreshObj() : void
+    {
+        $this->loadObj($this->guid);
+    }
+
+    /*
      * This function will update this object in the database, or insert new
      * data if this object does not yet have a GUID.  This function uses the
      * $fields array to construct SQL queries.
@@ -118,7 +127,10 @@ abstract class table
                 foreach ($flds as $fld)
                 {
                     if (!isset($this->$fld))
+                    {
+                        $this->$fld = "";
                         continue;
+                    }
 
                     $fld = database::esc($fld);
                     $fldstr .= $fld . ", ";