From 656560c3766190a2251ea2fd5d65d1f242c844ba Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 19 Aug 2013 19:53:45 +0000
Subject: [PATCH] Make sure et2 apps don't get passed back to old etemplate

---
 etemplate/js/etemplate2.js | 2 +-
 etemplate/process_exec.php | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/etemplate/js/etemplate2.js b/etemplate/js/etemplate2.js
index e1f117520c..7544c33258 100644
--- a/etemplate/js/etemplate2.js
+++ b/etemplate/js/etemplate2.js
@@ -388,7 +388,7 @@ etemplate2.prototype.postSubmit = function()
 	if (canSubmit)
 	{
 		var form = jQuery("<form id='form' action='"+egw().webserverUrl + 
-			"/etemplate/process_exec.php?menuaction=" + this.widgetContainer.egw().getAppName()+ "' method='POST'>");
+			"/etemplate/process_exec.php?menuaction=" + this.widgetContainer.egw().getAppName()+ "&ajax=true' method='POST'>");
 
 		var etemplate_id = jQuery(document.createElement("input"))
 			.attr("name",'etemplate_exec_id')
diff --git a/etemplate/process_exec.php b/etemplate/process_exec.php
index bd91e78865..2abb19d338 100644
--- a/etemplate/process_exec.php
+++ b/etemplate/process_exec.php
@@ -21,4 +21,11 @@ $GLOBALS['egw_info'] = array(
 );
 include('../header.inc.php');
 
-ExecMethod('etemplate.etemplate.process_exec');
+if($_GET['ajax'])
+{
+	ExecMethod('etemplate.etemplate_new.process_exec');
+}
+else
+{
+	ExecMethod('etemplate.etemplate.process_exec');
+}