Merge branch 'dev'

alexhambley · Apr 23, 2018 · 8721b60 · 8721b60
2 parents d02a9ae + f96986e
commit 8721b60
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/src/view_elements.php b/src/view_elements.php
@@ -1,8 +1,11 @@
 <?php
     session_start();
-    $_SESSION['theme1'] = $_GET['theme1'];
-    $_SESSION['theme2'] = $_GET['theme2'];
-    $_SESSION['theme3'] = $_GET['theme3'];
+    if (!empty($_GET['theme1']))
+    {
+        $_SESSION['theme1'] = $_GET['theme1'];
+        $_SESSION['theme2'] = $_GET['theme2'];
+        $_SESSION['theme3'] = $_GET['theme3'];
+    }
     include "header.php";
     include "navbar.php";
     include "db.php";

diff --git a/src/view_students.php b/src/view_students.php
@@ -91,11 +91,13 @@
                     </button> 
                     <p>
                     </p>
-                    <button class="btn btn-default" type="submit" name=skip value="true" style="border-color: #192A6C">
-                        Enter Element Choices Only
-                    </button>
                 </fieldset>
             </form>
+            <form action="view_elements.php">
+                <button class="btn btn-default" type="submit" name=skip value="true" style="border-color: #192A6C">
+                    Enter Element Choices Only
+                </button>
+            </form>
 
         </div>
         <div class="col-sm-4">