Merge remote-tracking branch 'gitorious/master' into routing

Conflicts:
	apps/files/js/fileactions.js
	apps/files_archive/js/archive.js

1 files changed, 3 insertions, 3 deletions

diff --git a/apps/files/index.php b/apps/files/index.php
index ffe9493272b..ea5192629b7 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -39,7 +39,7 @@ OCP\App::setActiveNavigationEntry( 'files_index' );
 $dir = isset( $_GET['dir'] ) ? stripslashes($_GET['dir']) : '';
 // Redirect if directory does not exist
 if(!OC_Filesystem::is_dir($dir.'/')) {
-	header('Location: '.$_SERVER['PHP_SELF'].'');
+	header('Location: '.$_SERVER['SCRIPT_NAME'].'');
 	exit();
 }
 
@@ -92,8 +92,8 @@ $maxUploadFilesize = min($maxUploadFilesize ,$freeSpace);
 $tmpl = new OCP\Template( 'files', 'index', 'user' );
 $tmpl->assign( 'fileList', $list->fetchPage(), false );
 $tmpl->assign( 'breadcrumb', $breadcrumbNav->fetchPage(), false );
-$tmpl->assign( 'dir', $dir);
-$tmpl->assign( 'readonly', !OC_Filesystem::is_writable($dir.'/'));
+$tmpl->assign( 'dir', OC_Filesystem::normalizePath($dir));
+$tmpl->assign( 'isCreatable', OC_Filesystem::isCreatable($dir.'/'));
 $tmpl->assign( 'files', $files );
 $tmpl->assign( 'uploadMaxFilesize', $maxUploadFilesize);
 $tmpl->assign( 'uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));