Skip to content

Commit

Permalink
Merge branch 'hotfix-10.27.17' into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
DominicWatson committed Oct 25, 2024
2 parents 9950942 + 6096a5c commit a6f6b27
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions system/services/presideObjects/PresideObjectService.cfc
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@ component displayName="Preside Object Service" {
}

var obfuscations = _getObfuscationsInSql( sqlAndParams.sql );

for( param in sqlAndParams.params ) {
if ( IsStruct( param ) ) {
key = param.name;
Expand Down Expand Up @@ -481,7 +481,7 @@ component displayName="Preside Object Service" {
return sqlAndParams;
}

private array function _getObfuscationsInSql(
private array function _getObfuscationsInSql(
required string sql
) {
var obfuscations = [];
Expand All @@ -492,7 +492,7 @@ component displayName="Preside Object Service" {
if ( !Len( matched.match[1] ) ) {
continue;
}

var decoded = ToString( ToBinary( ReReplace( matched.match[1], obfsPattern, "\1" ) ) );
ArrayAppend( obfuscations, {
encoded = matched.match[1]
Expand All @@ -519,8 +519,8 @@ component displayName="Preside Object Service" {
private void function _applyNewObfuscatedSql( required struct obfuscation ) {
for ( var subObfuscation in arguments.obfuscation.obfuscations ) {
_applyNewObfuscatedSql( subObfuscation );
arguments.obfuscation.decoded = ReReplaceNoCase(

arguments.obfuscation.decoded = ReReplaceNoCase(
arguments.obfuscation.decoded
, subObfuscation.encoded
, _getSqlRunner().obfuscateSqlForPreside( subObfuscation.decoded )
Expand Down Expand Up @@ -3562,7 +3562,7 @@ component displayName="Preside Object Service" {

if ( arguments.specificVersion ) {
versionFilter = "#arguments.objectName#._version_number = :#arguments.objectName#._version_number";
params.append( { name="#arguments.objectName#___version_number", value=arguments.specificVersion, type="cf_sql_int" } );
params.append( { name="#arguments.objectName#___version_number", value=arguments.specificVersion, type="cf_sql_bigint" } );

if ( !arguments.allowDraftVersions && usesDrafts ) {
versionFilter &= " and ( #arguments.objectName#._version_is_draft is null or #arguments.objectName#._version_is_draft = :#arguments.objectName#._version_is_draft )";
Expand Down

0 comments on commit a6f6b27

Please sign in to comment.