--- viewssub/viewssub.module	Fri Mar 25 14:36:26 2011
+++ viewssub/viewssub_new.module	Fri Mar 25 14:09:08 2011
@@ -71,8 +71,14 @@ function viewssub_get_all_substitutions(
 /**
  * Get all custom defined Views query substitutions.
  */
-function viewssub_get_custom_substitutions() {
+function viewssub_get_custom_substitutions($include_custom_substitutions_in_code = TRUE) {
   $custom_substitutions = array();
+  
+  if ($include_custom_substitutions_in_code) {
+    // Add query substitutions from code, but allow the inputted values above to override them.
+    $custom_substitutions = module_invoke_all('viewssub_get_custom_substitutions', $view);
+  }
+  
   $keys = variable_get('viewssub_custom_keys', array());
   $values = variable_get('viewssub_custom_values', array());
 
