Index: uc_node_checkout/uc_node_checkout.module
===================================================================
--- uc_node_checkout/uc_node_checkout.module	(revision 1016)
+++ uc_node_checkout/uc_node_checkout.module	(working copy)
@@ -407,6 +407,10 @@
       // Redirect non-administrators to the shopping cart after edits.
       if (variable_get('uc_node_checkout_submit_redirect', TRUE) && !user_access('edit any '. $type .' content')) {
         $form['#redirect'] = variable_get('uc_add_item_redirect', 'cart');
+        // If redirect is <none>, we need to come back to the current page after submit.
+        if ($form['#redirect'] == '<none>') {
+          $form['#redirect'] = request_uri();
+        }
       }
     }
   }
@@ -629,7 +633,13 @@
         if (uc_node_checkout_node_associated($node) &&
             !user_access('edit any '. $node->type .' content') &&
             uc_node_checkout_load_cart_item($node->nid)) {
-          drupal_goto(variable_get('uc_add_item_redirect', 'cart'));
+              $redirect = variable_get('uc_add_item_redirect', 'cart');
+              if ($redirect == '<none>') {
+                drupal_goto('cart');
+              }
+              else {
+                drupal_goto($redirect);
+              }
         }
       }
 
