Merge branch 'patch-2' of https://github.com/zspitzer/Preside-CMS int…

…o feature-PRESIDECMS-2161_variables-scoping

system/coldboxModifications/cachebox/store/indexers/MetadataIndexer.cfc

@@ -11,23 +11,23 @@ component extends="coldbox.system.cache.store.indexers.MetadataIndexer" {
 	}
 
 	public any function clear( required any objectKey ) {
-		return poolMetadata.remove( arguments.objectKey );
+		return variables.poolMetadata.remove( arguments.objectKey );
 	}
 
 	public any function getKeys() {
-		return javaCollections.list( poolMetadata.keys() );
+		return javaCollections.list( variables.poolMetadata.keys() );
 	}
 
 	public any function getObjectMetadata( required any objectKey ) {
-		return poolMetadata.get( arguments.objectKey );
+		return variables.poolMetadata.get( arguments.objectKey );
 	}
 
 	public any function setObjectMetadata( required any objectKey, required any metadata ) {
-		return poolMetadata.put( arguments.objectKey, arguments.metadata );
+		return variables.poolMetadata.put( arguments.objectKey, arguments.metadata );
 	}
 
 	public any function objectExists( required any objectKey ) {
-		return poolMetadata.containsKey( arguments.objectKey );
+		return variables.poolMetadata.containsKey( arguments.objectKey );
 	}
 
 	public any function getObjectMetadataProperty( required any objectKey, required any property ) {
@@ -45,6 +45,6 @@ component extends="coldbox.system.cache.store.indexers.MetadataIndexer" {
 	}
 
 	public any function getSize() {
-		return poolMetadata.size();
+		return variables.poolMetadata.size();
 	}
-}
+}

system/coldboxModifications/ioc/DelayedInjector.cfc

@@ -52,9 +52,9 @@ component {
 	}
 
 	private any function _getInstance() {
-		return _instance ?: NullValue();
+		return variables._instance ?: NullValue();
 	}
 	private void function _setInstance( required any instance ) {
-		_instance = arguments.instance;
+		variables._instance = arguments.instance;
 	}
-}
+}