Merge branch 'hotfix-10.7.13' into stable

pixl8 · Dec 16, 2016 · c7aaf07 · c7aaf07
2 parents b1ab90c + 68afd11
commit c7aaf07
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/box.json b/box.json
@@ -1,6 +1,6 @@
 {
     "name":"PresideCMS",
-    "version":"10.7.12",
+    "version":"10.7.13",
     "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.12",
+    "version":"10.7.13",
     "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.12
+preside.version=10.7.13
 ##############################
diff --git a/system/services/admin/AuditService.cfc b/system/services/admin/AuditService.cfc
@@ -106,12 +106,20 @@ component displayName="Audit Service" {
 			filter = {};
 		}
 
-		return _getDao().selectData(
-			  filter       = filter
+		var subset = _getDao().selectData(
+			  selectFields = [ "audit_log.id" ]
+			, filter       = filter
 			, filterParams = params
 			, orderby      = "audit_log.datecreated desc"
 			, maxRows      = arguments.pageSize
 			, startRow     = ( ( arguments.page - 1 ) * arguments.pageSize ) + 1
+		);
+
+		subset = subset.recordCount ? ValueArray( subset.id ) : [];
+
+		return _getDao().selectData(
+			  filter       = { "audit_log.id" = subset }
+			, orderby      = "audit_log.datecreated desc"
 			, selectFields = [
 				  "audit_log.id"
 				, "audit_log.type"