Merge remote-tracking branch 'upstream/master'

nextcloud · Jul 1, 2019 · 1f4129b · 1f4129b
2 parents 28499f4 + 452f1e0
commit 1f4129b
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
@@ -2189,7 +2189,7 @@
 
 		_updateDirectoryPermissions: function() {
 			var isCreatable = (this.dirInfo.permissions & OC.PERMISSION_CREATE) !== 0 && this.$el.find('#free_space').val() !== '0';
-			this.$el.find('#permissions').val(permissions);
+			this.$el.find('#permissions').val(this.dirInfo.permissions);
 			this.$el.find('.creatable').toggleClass('hidden', !isCreatable);
 			this.$el.find('.notCreatable').toggleClass('hidden', isCreatable);
 		},

diff --git a/lib/private/Comments/Manager.php b/lib/private/Comments/Manager.php
@@ -98,6 +98,15 @@ protected function normalizeDatabaseData(array $data) {
 		return $data;
 	}
 
+
+	/**
+	 * @param array $data
+	 * @return IComment
+	 */
+	public function getCommentFromData(array $data): IComment {
+		return new Comment($this->normalizeDatabaseData($data));
+	}
+
 	/**
 	 * prepares a comment for an insert or update operation after making sure
 	 * all necessary fields have a value assigned.
@@ -253,7 +262,8 @@ public function get($id) {
 			throw new NotFoundException();
 		}
 
-		$comment = new Comment($this->normalizeDatabaseData($data));
+
+		$comment = $this->getCommentFromData($data);
 		$this->cache($comment);
 		return $comment;
 	}
@@ -308,7 +318,7 @@ public function getTree($id, $limit = 0, $offset = 0) {
 
 		$resultStatement = $query->execute();
 		while ($data = $resultStatement->fetch()) {
-			$comment = new Comment($this->normalizeDatabaseData($data));
+			$comment = $this->getCommentFromData($data);
 			$this->cache($comment);
 			$tree['replies'][] = [
 				'comment' => $comment,
@@ -367,7 +377,7 @@ public function getForObject(
 
 		$resultStatement = $query->execute();
 		while ($data = $resultStatement->fetch()) {
-			$comment = new Comment($this->normalizeDatabaseData($data));
+			$comment = $this->getCommentFromData($data);
 			$this->cache($comment);
 			$comments[] = $comment;
 		}
@@ -455,7 +465,7 @@ public function getForObjectSince(
 
 		$resultStatement = $query->execute();
 		while ($data = $resultStatement->fetch()) {
-			$comment = new Comment($this->normalizeDatabaseData($data));
+			$comment = $this->getCommentFromData($data);
 			$this->cache($comment);
 			$comments[] = $comment;
 		}
@@ -485,7 +495,7 @@ protected function getLastKnownComment(string $objectType,
 		$result->closeCursor();
 
 		if ($row) {
-			$comment = new Comment($this->normalizeDatabaseData($row));
+			$comment = $this->getCommentFromData($row);
 			$this->cache($comment);
 			return $comment;
 		}
@@ -532,7 +542,7 @@ public function search(string $search, string $objectType, string $objectId, str
 		$comments = [];
 		$result = $query->execute();
 		while ($data = $result->fetch()) {
-			$comment = new Comment($this->normalizeDatabaseData($data));
+			$comment = $this->getCommentFromData($data);
 			$this->cache($comment);
 			$comments[] = $comment;
 		}

diff --git a/tests/ui-regression/package.json b/tests/ui-regression/package.json
@@ -9,7 +9,6 @@
     "author": "",
     "dependencies": {
         "chai": "^4.1.2",
-        "fs": "0.0.1-security",
         "mocha": "^5.2.0",
         "mocha-json-report": "0.0.2",
         "pixelmatch": "^5.0.2",