From: sherbrecher <oss@herbrecher.de>
Date: Fri, 15 Mar 2013 16:50:02 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: v6.0.0alpha2~1058^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ec45a8433dba8140565728500050035ddad0a20e;p=nextcloud-server.git

Merge remote-tracking branch 'upstream/master'

Conflicts:
	apps/files_external/templates/settings.php
---

ec45a8433dba8140565728500050035ddad0a20e
diff --cc apps/files_external/templates/settings.php
index 5a7b25d59a9,86492699fc2..b3b94a1dafd
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@@ -109,8 -154,9 +154,9 @@@
  			<?php endforeach; ?>
  			</tbody>
  		</table>
-         <input type="file" id="rootcert_import" name="rootcert_import">
-         <input type="submit" name="cert_import" value="<?php echo $l->t('Import Root Certificate'); ?>" />
- 		<?php endif; ?>
+ 		<input type="hidden" name="requesttoken" value="<?php p($_['requesttoken']); ?>">
 -		<input type="file" id="rootcert_import" name="rootcert_import" style="width:230px;">
++		<input type="file" id="rootcert_import" name="rootcert_import">
+ 		<input type="submit" name="cert_import" value="<?php p($l->t('Import Root Certificate')); ?>" />
  </fieldset>
  </form>
+ <?php endif; ?>