Skip to content

Commit

Permalink
Merge branch '6.0' of https://github.com/lucee/Lucee into 6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
zspitzer committed Apr 10, 2021
2 parents 94b4af3 + 097d785 commit 7b5d9cf
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion core/src/main/java/lucee/runtime/tag/Location.java
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public final class Location extends TagImpl {
@Override
public void release() {
super.release();
addtoken = true;
addtoken = false;
url = "";
statuscode = 302;
}
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/resource/library/function/location.cfm
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<cffunction name="location" output="no" returntype="void" hint="Stops execution of the current request and redirect to another location.">
<cfargument name="url" type="string" required="yes" hint="URL where the call should redirect">
<cfargument name="addToken" type="boolean" required="no" default="#true#" hint="appends client variable information to URL (true|false)">
<cfargument name="addToken" type="boolean" required="no" default="#false#" hint="appends client variable information to URL (true|false)">
<cfargument name="statusCode" type="numeric" required="no" default="#302#" hint="The HTTP status code (301,302(default), 303, 304, 305, 307)">
<cflocation attributeCollection="#arguments#">
</cffunction>
5 changes: 4 additions & 1 deletion core/src/main/java/resource/tld/core-base.tld
Original file line number Diff line number Diff line change
Expand Up @@ -4823,7 +4823,10 @@ Permits searching collections by title or displaying a separate title from the k
<required>false</required>
<rtexprvalue>true</rtexprvalue>
<description>Yes or No. clientManagement must be enabled, see cfapplication. Yes appends client variable
information to the URL you specify in the url.</description>
information to the URL you specify in the url.

Default is false (since Lucee 6, previously was true)
</description>
</attribute>
<attribute>
<type>number</type>
Expand Down

0 comments on commit 7b5d9cf

Please sign in to comment.