From 3eba8b76443a832f245839a1e744739bf087fa78 Mon Sep 17 00:00:00 2001
From: Pranav Kant <pranavk@collabora.co.uk>
Date: Mon, 24 Jul 2017 14:19:53 +0530
Subject: [PATCH] Use fileId instead of dir

(cherry picked from commit e9f9711421ed1eba9cdb3b787b1a49eaed7373d1)
---
 js/viewer/viewer.js                   | 4 ++--
 lib/Controller/DocumentController.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/js/viewer/viewer.js b/js/viewer/viewer.js
index e6f070e2..ef8ccb08 100644
--- a/js/viewer/viewer.js
+++ b/js/viewer/viewer.js
@@ -66,11 +66,11 @@ var odfViewer = {
 		var viewer;
 		if($('#isPublic').val() === '1') {
 			viewer = OC.generateUrl(
-				'apps/richdocuments/public?shareToken={shareToken}&fileName={fileName}&requesttoken={requesttoken}&dir={dir}',
+				'apps/richdocuments/public?shareToken={shareToken}&fileName={fileName}&requesttoken={requesttoken}&fileId={fileId}',
 				{
 					shareToken: $('#sharingToken').val(),
 					fileName: fileName,
-					dir: fileDir,
+					fileId: fileId,
 					requesttoken: OC.requestToken
 				}
 			);
diff --git a/lib/Controller/DocumentController.php b/lib/Controller/DocumentController.php
index aefbe10b..367a1e09 100644
--- a/lib/Controller/DocumentController.php
+++ b/lib/Controller/DocumentController.php
@@ -142,7 +142,7 @@ class DocumentController extends Controller {
 	 * @return TemplateResponse
 	 * @throws \Exception
 	 */
-	public function publicPage($shareToken, $fileName, $dir) {
+	public function publicPage($shareToken, $fileName, $fileId) {
 		try {
 			$share = $this->shareManager->getShareByToken($shareToken);
 			// not authenticated ?
@@ -156,7 +156,7 @@ class DocumentController extends Controller {
 
 			$node = $share->getNode();
 			if($node instanceof Folder) {
-				$item = $node->get($dir.'/'.$fileName);
+				$item = $node->getById($fileId)[0];
 			} else {
 				$item = $node;
 			}