Merge pull request #1497 from cfwheels/architecture-3.0

Fix for user-defined function

Author: zainforbjs

vendor/wheels/Controller.cfc

@@ -165,7 +165,11 @@ component output="false" displayName="Controller" extends="wheels.Global"{
 			local.functionName = local.method.name;
 
 			// Only add public, non-inherited methods
-			if (local.method.access eq "public") {
+			if (
+				local.method.access eq "public"
+				&& !structKeyExists(variables, local.method.name)
+				&& !structKeyExists(this, local.method.name)
+			) {
 				variables[local.functionName] = componentInstance[local.functionName];
 				this[local.functionName] = componentInstance[local.functionName];
 			}

vendor/wheels/Model.cfc

@@ -488,7 +488,11 @@ component output="false" displayName="Model" extends="wheels.Global"{
 			local.functionName = local.method.name;
 
 			// Only add public, non-inherited methods
-			if (local.method.access eq "public") {
+			if (
+				local.method.access eq "public"
+				&& !structKeyExists(variables, local.method.name)
+				&& !structKeyExists(this, local.method.name)
+			) {
 				variables[local.functionName] = componentInstance[local.functionName];
 				this[local.functionName] = componentInstance[local.functionName];
 			}