CRM-14701 QA fix

----------------------------------------
* CRM-14701: Form data not retained subsequent to contribution page on behalf of fix
  https://issues.civicrm.org/jira/browse/CRM-14701

diff --git a/CRM/Core/Page/AJAX/Location.php b/CRM/Core/Page/AJAX/Location.php
index 48de73257bc5090d034d338d14b0c401cf3e5865..0a241dfb35301d8f932cc3373ca39b9fbc64a666 100644 (file)
--- a/CRM/Core/Page/AJAX/Location.php
+++ b/CRM/Core/Page/AJAX/Location.php
@@ -51,7 +51,10 @@ class CRM_Core_Page_AJAX_Location {
 
     // Verify user id
     $user = CRM_Utils_Request::retrieve('uid', 'Integer', CRM_Core_DAO::$_nullObject, FALSE, CRM_Core_Session::singleton()->get('userID'));
-    if (!$user || !CRM_Contact_BAO_Contact_Permission::validateChecksumContact($user, CRM_Core_DAO::$_nullObject, FALSE)) {
+    if (empty($user) ||
+      (CRM_Utils_Request::retrieve('cs', 'String', $form, FALSE) &&
+        !CRM_Contact_BAO_Contact_Permission::validateChecksumContact($user, CRM_Core_DAO::$_nullObject, FALSE))
+    ) {
       CRM_Utils_System::civiExit();
     }
 
@@ -306,4 +309,3 @@ class CRM_Core_Page_AJAX_Location {
     CRM_Utils_System::civiExit();
   }
 }
-