Order of request edit/wizard pages changed.

application/controllers/RequestController.php

@@ -491,19 +491,18 @@ class RequestController extends Nmc_Controller_Action
 
         $currentFormIndex = array_search(strtolower($currentForm),
                                          array_map("strtolower", $requestFormOrder));
-        if($currentFormIndex === false) {
-            if (strtolower($currentForm) == 'edit') {
-                $nextForm = 'Preview';
-            } else if ($submit = 'ReturntoEdit') {
-                $nextForm = 'Edit';
-            } else {
-                $nextForm = $requestFormOrder[count($requestFormOrder) - 1];
-            }
+
+        if ($submit == 'ReturntoEdit') {
+            $nextForm = 'Edit';
+        } else if($currentFormIndex === false) {
+            // if the current form page is something unexpected
+            $nextForm = 'Preview';
         } else if($currentFormIndex < count($requestFormOrder) - 1) {
             $nextForm = $requestFormOrder[$currentFormIndex + 1];
         } else {
             $nextForm = $requestFormOrder[$currentFormIndex];
         }
+
         if($currentFormIndex > 0) {
             $prevForm = $requestFormOrder[$currentFormIndex - 1];
         } else {