--- rwiki/trunk/rwiki-tool/tool/src/java/uk/ac/cam/caret/sakai/rwiki/tool/RWikiServlet.java	2010/04/22 16:23:35	76483
+++ rwiki/trunk/rwiki-tool/tool/src/java/uk/ac/cam/caret/sakai/rwiki/tool/RWikiServlet.java	2010/04/22 17:03:40	76484
@@ -150,14 +150,8 @@
 		request.setAttribute(Tool.NATIVE_URL, Tool.NATIVE_URL);
 		
 		String targetURL = persistState(request);
-		String queryString= request.getQueryString();
-		String[] query=null;
-		if (queryString!=null)
-		{
-			query= queryString.split("&");
-		}
 				
-		if (targetURL != null && targetURL.trim().length() > 0 && !(query[0].equals("action=search")||query[0].equals("action=full_search")))
+		if (targetURL != null && targetURL.trim().length() > 0)
 		{
 			response.sendRedirect(targetURL);
 			return;
@@ -277,6 +271,11 @@
 				return false;
 			}
 		}
+		
+		String action = request.getParameter(RequestHelper.ACTION);
+		if (action != null && action.length() > 0) {
+			return false;
+		}
 
 		String pageName = request.getParameter(ViewBean.PAGE_NAME_PARAM);
 		if  (pageName == null || pageName.trim().length() == 0) {