aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorBart Visscher <bartv@thisnet.nl>2012-06-22 22:46:09 +0200
committerBart Visscher <bartv@thisnet.nl>2012-06-22 22:46:12 +0200
commit2e6e1544757c3ef9e12314bfc99b2f09e7b397d9 (patch)
treead51abc6c0c53dabed00a981e06c1066230071b8 /apps
parentf4b937c6fe325b1ad8bceb7ceba69a9a8a068bcd (diff)
downloadnextcloud-server-2e6e1544757c3ef9e12314bfc99b2f09e7b397d9.tar.gz
nextcloud-server-2e6e1544757c3ef9e12314bfc99b2f09e7b397d9.zip
Gallery: Fix opening folders with a ' in the name
Diffstat (limited to 'apps')
-rw-r--r--apps/gallery/js/pictures.js2
-rw-r--r--apps/gallery/lib/tiles.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/gallery/js/pictures.js b/apps/gallery/js/pictures.js
index 3a797889688..91fbf5be967 100644
--- a/apps/gallery/js/pictures.js
+++ b/apps/gallery/js/pictures.js
@@ -60,7 +60,7 @@ function deplode(element) {
}
function openNewGal(album_name) {
- root = root + album_name + "/";
+ root = root + decodeURIComponent(album_name) + "/";
var url = window.location.toString().replace(window.location.search, '');
url = url + "?app=gallery&root="+encodeURIComponent(root);
diff --git a/apps/gallery/lib/tiles.php b/apps/gallery/lib/tiles.php
index 011168471f0..5efe0d7a299 100644
--- a/apps/gallery/lib/tiles.php
+++ b/apps/gallery/lib/tiles.php
@@ -168,7 +168,7 @@ class TileStack extends TileBase {
}
public function getOnClickAction() {
- return 'javascript:openNewGal(\''.\OCP\Util::sanitizeHTML($this->stack_name).'\');';
+ return 'javascript:openNewGal(\''.rawurlencode($this->stack_name).'\');';
}
private $tiles_array;