Merge branch 'hotfix-10.7.35' into stable

pixl8 · Feb 24, 2017 · 53e7ae7 · 53e7ae7
2 parents d813b44 + bcc929a
commit 53e7ae7
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/box.json b/box.json
@@ -1,6 +1,6 @@
 {
     "name":"PresideCMS",
-    "version":"10.7.34",
+    "version":"10.7.35",
     "author":"Pixl8 Interactive",
     "createPackageDirectory":true,
     "packageDirectory":"preside",

diff --git a/box.json.no.deps b/box.json.no.deps
@@ -1,6 +1,6 @@
 {
     "name":"PresideCMS",
-    "version":"10.7.34",
+    "version":"10.7.35",
     "author":"Pixl8 Interactive",
     "createPackageDirectory":true,
     "packageDirectory":"preside",

diff --git a/support/build/build.properties b/support/build/build.properties
@@ -2,5 +2,5 @@ build.number.remote.url=http://downloads.presidecms.com/presidecms/build.number
 
 ##############################
 # MANUALLY UPDATE EACH VERSION
-preside.version=10.7.34
+preside.version=10.7.35
 ##############################
diff --git a/system/coldboxModifications/RequestContextDecorator.cfc b/system/coldboxModifications/RequestContextDecorator.cfc
@@ -83,7 +83,7 @@ component extends="coldbox.system.web.context.RequestContextDecorator" output=fa
 		var prc = getRequestContext().getCollection( private=true );
 
 		if ( arguments.siteId.len() ) {
-			arguments.queryString = ListAppend( arguments.queryString, "_sid=" & arguments.siteId, "&" );
+			arguments.queryString = ListPrepend( arguments.queryString, "_sid=" & arguments.siteId, "&" );
 		}
 
 		announceInterception(
@@ -170,7 +170,7 @@ component extends="coldbox.system.web.context.RequestContextDecorator" output=fa
 		arguments.linkTo = ListAppend( "admin", arguments.linkTo, "." );
 
 		if ( isActionRequest( arguments.linkTo ) ) {
-			arguments.queryString = ListAppend( arguments.queryString, "csrfToken=" & this.getCsrfToken(), "&" );
+			arguments.queryString = ListPrepend( arguments.queryString, "csrfToken=" & this.getCsrfToken(), "&" );
 		}
 
 		return buildLink( argumentCollection = arguments );