diff --git a/.htaccess b/.htaccess
index 181248267559e377dbac74e01b395cbc215558f6..ced9ae652d2c345152619b3ef29cbdbbf0ed873e 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,7 +1,7 @@
-ErrorDocument 404 //owncloud/core/templates/404.php
+ErrorDocument 404 /core/templates/404.php
 <IfModule mod_php5.c>
-	php_value upload_max_filesize 512M
-	php_value post_max_size 512M
-	SetEnv htaccessWorking true
+php_value upload_max_filesize 512M
+php_value post_max_size 512M
+SetEnv htaccessWorking true
 </IfModule>
 Options -Indexes
diff --git a/files/js/fileactions.js b/files/js/fileactions.js
index 4ff8562fef3bcbf3af21f0b6bced2d8bf8042ee5..5d31af40376ee11a4a084344c3470748349616a3 100644
--- a/files/js/fileactions.js
+++ b/files/js/fileactions.js
@@ -135,6 +135,9 @@ FileActions.register('all','Delete',function(){return OC.imagePath('core','actio
 FileActions.register('all','Rename',function(){return OC.imagePath('core','actions/rename')},function(filename){
 	FileList.rename(filename);
 });
+FileActions.register('text','Edit',function(){return OC.imagePath('core','actions/rename')},function(filename){
+	window.location='/apps/editor/index.php?file='+filename+'&dir='+$('#dir').val();
+});
 
 //FileActions.setDefault('all','Download');
 
@@ -142,4 +145,4 @@ FileActions.register('dir','Open','',function(filename){
 	window.location='index.php?dir='+$('#dir').val()+'/'+filename;
 });
 
-FileActions.setDefault('dir','Open');
+FileActions.setDefault('dir','Open');  
diff --git a/lib/filesystem.php b/lib/filesystem.php
index b97fa8d784a12e34b86607d89caab0d107d66b50..f84cda20eac690a064404e9cfe43bdde3590273d 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -441,6 +441,10 @@ class OC_Filesystem{
 		return $files;
 		
 	}
+	
+	static public function update_session_file_hash($sessionname,$sessionvalue){
+		$_SESSION[$sessionname] = $sessionvalue;
+	}
 
 	/**
 	 * abstraction for running most basic operations