diff options
| -rw-r--r-- | .htaccess | 8 | ||||
| -rw-r--r-- | files/js/fileactions.js | 5 | ||||
| -rw-r--r-- | lib/filesystem.php | 4 |
3 files changed, 12 insertions, 5 deletions
diff --git a/.htaccess b/.htaccess index 18124826755..ced9ae652d2 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 4ff8562fef3..5d31af40376 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 b97fa8d784a..f84cda20eac 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 |