diff options
| author | Michael Gapczynski <mtgap@owncloud.com> | 2013-02-19 19:12:14 -0500 |
|---|---|---|
| committer | Michael Gapczynski <mtgap@owncloud.com> | 2013-02-19 19:12:14 -0500 |
| commit | 702c27b0e63cddb21f483c0a69e899e08b42ec07 (patch) | |
| tree | 5235c4b45c2de00c9d5633e25ad5142388587f1f /apps/files_external/templates | |
| parent | 037c3ee4ecf6f3ffae0f1707074ac13b234dc1ec (diff) | |
| parent | 38782036798dbe0a34995a3fca0aa92583cb9099 (diff) | |
| download | nextcloud-server-702c27b0e63cddb21f483c0a69e899e08b42ec07.tar.gz nextcloud-server-702c27b0e63cddb21f483c0a69e899e08b42ec07.zip | |
Merge branch 'master' into external_storage_ui_feedback
Conflicts:
apps/files_external/js/settings.js
apps/files_external/lib/smb.php
apps/files_external/templates/settings.php
lib/files/storage/common.php
Diffstat (limited to 'apps/files_external/templates')
| -rw-r--r-- | apps/files_external/templates/settings.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php index 16ad6c77bae..76d691eedb2 100644 --- a/apps/files_external/templates/settings.php +++ b/apps/files_external/templates/settings.php @@ -24,7 +24,7 @@ <?php endif; ?> </td> <td class="mountPoint"><input type="text" name="mountPoint" - value="<?php echo $mountPoint; ?>" + value="<?php p($mountPoint); ?>" placeholder="<?php echo $l->t('Folder name'); ?>" /></td> <?php if ($mountPoint == ''): ?> <td class="backend"> @@ -154,6 +154,7 @@ <?php endforeach; ?> </tbody> </table> + <input type="hidden" name="requesttoken" value="<?php echo $_['requesttoken']; ?>"> <input type="file" id="rootcert_import" name="rootcert_import" style="width:230px;"> <input type="submit" name="cert_import" value="<?php echo $l->t('Import Root Certificate'); ?>" /> </fieldset> |