hotfix 2.6.1 (#875)

server-ce/hotfix/2.6.1/Dockerfile

@@ -0,0 +1,5 @@
+FROM sharelatex/sharelatex:2.6.0-RC1
+
+# Patch: fixes Project restore inserts bad projectId into deletedFiles
+COPY document-deleter-object-id.patch ${baseDir}
+RUN cd ${baseDir} && patch -p0 < document-deleter-object-id.patch

server-ce/hotfix/2.6.1/document-deleter-object-id.patch

@@ -0,0 +1,10 @@
+--- /var/www/sharelatex/web/app/src/Features/Project/ProjectDeleter.js
++++ /var/www/sharelatex/web/app/src/Features/Project/ProjectDeleter.js
+@@ -278,6 +278,7 @@ async function deleteProject(projectId, options = {}) {
+ }
+ 
+ async function undeleteProject(projectId, options = {}) {
++  projectId = ObjectId(projectId)
+   let deletedProject = await DeletedProject.findOne({
+     'deleterData.deletedProjectId': projectId
+   }).exec()