Merge branch 'hotfix-10.7.22' into stable

pixl8 · Jan 13, 2017 · 2b836eb · 2b836eb
2 parents 61d59e7 + e5240b2
commit 2b836eb
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 15 deletions.
diff --git a/box.json b/box.json
@@ -1,6 +1,6 @@
 {
     "name":"PresideCMS",
-    "version":"10.7.21",
+    "version":"10.7.22",
     "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.21",
+    "version":"10.7.22",
     "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.21
+preside.version=10.7.22
 ##############################
diff --git a/system/coldboxModifications/cachebox/CacheProvider.cfc b/system/coldboxModifications/cachebox/CacheProvider.cfc
@@ -17,6 +17,13 @@ component output=false extends="coldbox.system.cache.providers.CacheBoxColdBoxPr
 		return result;
 	}
 
+	public any function clearQuiet( required any objectKey ) output=false {
+		super.clearQuiet( argumentCollection=arguments );
+
+		request[ _requestKey ] = request[ _requestKey ] ?: {};
+		request[ _requestKey ].delete( arguments.objectKey );
+	}
+
 	public any function get( required string objectKey ) output=false {
 		request[ _requestKey ] = request[ _requestKey ] ?: {};
 

diff --git a/system/preside-objects/assetManager/asset.cfc b/system/preside-objects/assetManager/asset.cfc
@@ -4,7 +4,7 @@
  */
 component extends="preside.system.base.SystemPresideObject" labelfield="title" output=false displayName="Asset" {
 
-	property name="asset_folder" relationship="many-to-one"                          required=true   uniqueindexes="assetfolder|1";
+	property name="asset_folder" relationship="many-to-one"                          required=true   uniqueindexes="assetfolder|1" onupdate="cascade-if-no-cycle-check";
 
 	property name="title"             type="string"  dbtype="varchar" maxLength=150     required=true   uniqueindexes="assetfolder|2";
 	property name="storage_path"      type="string"  dbtype="varchar" maxLength=255     required=true   uniqueindexes="assetpath";

diff --git a/system/preside-objects/core/page.cfc b/system/preside-objects/core/page.cfc
@@ -28,8 +28,8 @@ component extends="preside.system.base.SystemPresideObject" labelfield="title" o
 	property name="author"                                  type="string"  dbtype="varchar" maxLength="100"  required=false;
 	property name="browser_title"                           type="string"  dbtype="varchar" maxLength="100"  required=false;
 	property name="description"                             type="string"  dbtype="varchar" maxLength="255"  required=false;
-	property name="embargo_date"                            type="date"    dbtype="datetime"                 required=false                                                                   control="datetimepicker";
-	property name="expiry_date"                             type="date"    dbtype="datetime"                 required=false                                                                   control="datetimepicker";
+	property name="embargo_date"                            type="date"    dbtype="datetime"                 required=false                                                                   control="datetimepicker" indexes="embargodate";
+	property name="expiry_date"                             type="date"    dbtype="datetime"                 required=false                                                                   control="datetimepicker" indexes="expirydate";
 	property name="access_restriction"                      type="string"  dbtype="varchar" maxLength="7"    required=false default="inherit" format="regex:(inherit|none|full|partial)"      control="select"          values="inherit,none,full,partial"      labels="preside-objects.page:access_restriction.option.inherit,preside-objects.page:access_restriction.option.none,preside-objects.page:access_restriction.option.full,preside-objects.page:access_restriction.option.partial";
 	property name="iframe_restriction"                      type="string"  dbtype="varchar" maxLength="10"   required=false default="inherit" format="regex:(inherit|block|sameorigin|allow)" control="select"          values="inherit,block,sameorigin,allow" labels="preside-objects.page:iframe_restriction.option.inherit,preside-objects.page:iframe_restriction.option.block,preside-objects.page:iframe_restriction.option.sameorigin,preside-objects.page:iframe_restriction.option.allow";
 	property name="full_login_required"                     type="boolean" dbtype="boolean"                  required=false default=false;

diff --git a/system/services/siteTree/SiteTreeService.cfc b/system/services/siteTree/SiteTreeService.cfc
@@ -122,16 +122,24 @@ component {
 		, boolean allowDrafts  = $getRequestContext().showNonLiveContent()
 
 	) {
-		var args = { filter="page.id = :id", filterParams={}, useCache=arguments.useCache, allowDraftVersions=arguments.allowDrafts };
+		var args = { filter="", filterParams={}, useCache=arguments.useCache, allowDraftVersions=arguments.allowDrafts };
 
 		if ( StructKeyExists( arguments, "id" ) ) {
+			args.filter = "page.id = :id";
 			args.filterParams.id = arguments.id;
 
 		} else if ( StructKeyExists( arguments, "slug" ) ) {
-			args.filterParams.id = getPageIdBySlug( argumentCollection=arguments );
+			if ( arePageSlugsMultilingual() ) {
+				args.filter          = "page.id = :id";
+				args.filterParams.id = _getPageIdWithMultilingualSlug( argumentCollection=arguments );
+			} else {
+				args.filter       = "page.slug = :slug and page._hierarchy_slug = :_hierarchy_slug" // this double match is for performance - the full slug cannot be indexed because of its potential size
+				args.filterParams = { slug = ListLast( arguments.slug, "/" ), _hierarchy_slug = arguments.slug }
+			}
 
 		} else if ( StructKeyExists( arguments, "systemPage" ) ) {
-			args.filterParams.id = getPageIdBySystemPageType( arguments.systemPage );
+			args.filter       = "page.page_type = :page_type"
+			args.filterParams = { page_type = arguments.systemPage }
 
 		} else {
 			throw(
@@ -978,7 +986,7 @@ component {
 		for( var pageType in pageTypes ) {
 			var pageTypeId = pageType.getId();
 			if ( pageTypesService.isSystemPageType( pageTypeId ) && pageTypesService.isPageTypeAvailableToSiteTemplate( pageTypeId, site.template ?: "" ) ) {
-				var page = getPage( systemPage=pageTypeId );
+				var page = getPage( systemPage=pageTypeId, useCache=false );
 
 				if ( !page.recordCount ) {
 					_createSystemPage( pageType );
@@ -1323,13 +1331,12 @@ component {
 		var loginSvc   = _getLoginService();
 
 		if ( Len( Trim( parentType ) ) && parentType != "none" ) {
-			var parent = getPage( systemPage=parentType );
+			var parent = getPage( systemPage=parentType, useCache=false );
 			if ( !parent.recordCount ) {
-				_createSystemPage( _getPageTypesService().getPageType( parentType ) );
+				parent = _createSystemPage( _getPageTypesService().getPageType( parentType ) );
+			} else {
+				parent = parent.id;
 			}
-			parent = getPage( systemPage=parentType );
-
-			parent = parent.id ?: "";
 		}
 
 		var addPageArgs = {