Merge branch 'master' into from-insane-autoescape-to-p

Conflicts:
	apps/files/templates/index.php

diff --cc apps/files/templates/index.php
index ed6dd2f04cfa36393962ca9bc4f05235a0529da0,5053dff95e5af2c95324213aaa71bf8c8b83640d..78c0901c110caafb9f298127f369d0131ed185dd
--- 1/apps/files/templates/index.php
--- 2/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@@ -49,10 -49,11 +49,11 @@@
                        </div>
                </div>
                <div id="file_action_panel"></div>
 -      <?php else: ?>
 +      <?php else:?>
+               <div class="crumb last"><?php p($l->t('You don’t have write permissions here.'))?></div>
 -              <input type="hidden" name="dir" value="<?php echo $_['dir'] ?>" id="dir">
 +              <input type="hidden" name="dir" value="<?php p($_['dir']) ?>" id="dir">
        <?php endif;?>
 -      <input type="hidden" name="permissions" value="<?php echo $_['permissions']; ?>" id="permissions">
 +      <input type="hidden" name="permissions" value="<?php p($_['permissions']); ?>" id="permissions">
  </div>
  
  <?php if (isset($_['files']) and $_['isCreatable'] and count($_['files'])==0):?>