[Pkg-owncloud-commits] [owncloud] 58/111: readd sharing token to public template necessary for https://github.com/owncloud/apps/pull/1476

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 11425d142d6a52345365af21a955c94ad14d4b69
Author: Jörn Friedrich Dreyer <jfd at butonic.de>
Date:   Fri Nov 15 16:27:41 2013 +0100

    readd sharing token to public template
    necessary for https://github.com/owncloud/apps/pull/1476
---
 apps/files_sharing/public.php           |    1 +
 apps/files_sharing/templates/public.php |    1 +
 2 files changed, 2 insertions(+)

diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index 6504de84..d59f9b7 100644
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -149,6 +149,7 @@ if (isset($path)) {
 		$tmpl->assign('mimetype', \OC\Files\Filesystem::getMimeType($path));
 		$tmpl->assign('fileTarget', basename($linkItem['file_target']));
 		$tmpl->assign('dirToken', $linkItem['token']);
+		$tmpl->assign('sharingToken', $token);
 		$tmpl->assign('disableSharing', true);
 		$allowPublicUploadEnabled = (bool) ($linkItem['permissions'] & OCP\PERMISSION_CREATE);
 		if (\OCP\App::isEnabled('files_encryption')) {
diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index ef4c1c4..1d527dc 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -6,6 +6,7 @@
 <input type="hidden" id="isPublic" name="isPublic" value="1">
 <input type="hidden" name="dir" value="<?php p($_['dir']) ?>" id="dir">
 <input type="hidden" name="downloadURL" value="<?php p($_['downloadURL']) ?>" id="downloadURL">
+<input type="hidden" name="sharingToken" value="<?php p($_['sharingToken']) ?>" id="sharingToken">
 <input type="hidden" name="filename" value="<?php p($_['filename']) ?>" id="filename">
 <input type="hidden" name="mimetype" value="<?php p($_['mimetype']) ?>" id="mimetype">
 <header><div id="header">

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git