diff options
| author | Michael Gapczynski <GapczynskiM@gmail.com> | 2012-06-13 15:17:46 -0400 |
|---|---|---|
| committer | Michael Gapczynski <GapczynskiM@gmail.com> | 2012-06-13 15:17:46 -0400 |
| commit | b5889d6ffe2a91ccb223a84a220cb1580bc42929 (patch) | |
| tree | aca675ac30746341e8ed835a9cb233cf76a7e2cc /apps/gallery/lib | |
| parent | bd01e9346941fa85b4bb96a42cecdbc50e51c368 (diff) | |
| parent | f9bf34340c7618a90f8ac3452b7d89085882cab3 (diff) | |
| download | nextcloud-server-b5889d6ffe2a91ccb223a84a220cb1580bc42929.tar.gz nextcloud-server-b5889d6ffe2a91ccb223a84a220cb1580bc42929.zip | |
Merge commit 'refs/merge-requests/127' of git://gitorious.org/owncloud/owncloud into merge-requests/127
Conflicts:
apps/files_external/templates/settings.php
lib/template.php
Diffstat (limited to 'apps/gallery/lib')
| -rw-r--r-- | apps/gallery/lib/tiles.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/gallery/lib/tiles.php b/apps/gallery/lib/tiles.php index 5837c752ef6..e43c99bb76a 100644 --- a/apps/gallery/lib/tiles.php +++ b/apps/gallery/lib/tiles.php @@ -141,7 +141,7 @@ class TileStack extends TileBase { } public function get() { - $r = '<div class="title gallery_div">'.htmlentities($this->stack_name).'</div>'; + $r = '<div class="title gallery_div">'.$this->stack_name.'</div>'; for ($i = 0; $i < count($this->tiles_array); $i++) { $top = rand(-5, 5); $left = rand(-5, 5); @@ -168,7 +168,7 @@ class TileStack extends TileBase { } public function getOnClickAction() { - return 'javascript:openNewGal(\''.htmlentities($this->stack_name).'\');'; + return 'javascript:openNewGal(\''.$this->stack_name.'\');'; } private $tiles_array; |