From 014e2c88dd1dd32a59dd023b0b33384c54aec026 Mon Sep 17 00:00:00 2001
From: Sebastian Gierlinger <s.gierlinger@me.com>
Date: Tue, 24 Nov 2015 15:31:28 +0100
Subject: [PATCH] Restore options

refs #6122
- restore original options after delete
- this is a fix for one use case, long term we should aim to leave
options untouched and execute special queries with temporary data
---
 core/server/models/user.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/server/models/user.js b/core/server/models/user.js
index 499888499d..e5ca0d95a8 100644
--- a/core/server/models/user.js
+++ b/core/server/models/user.js
@@ -245,6 +245,7 @@ User = ghostBookshelf.Model.extend({
     findOne: function findOne(data, options) {
         var query,
             status,
+            optInc,
             lookupRole = data.role;
 
         delete data.role;
@@ -257,6 +258,7 @@ User = ghostBookshelf.Model.extend({
         delete data.status;
 
         options = options || {};
+        optInc = options.include;
         options.withRelated = _.union(options.withRelated, options.include);
         data = this.filterData(data);
 
@@ -285,6 +287,7 @@ User = ghostBookshelf.Model.extend({
 
         options = this.filterOptions(options, 'findOne');
         delete options.include;
+        options.include = optInc;
 
         return query.fetch(options);
     },