diff options
| author | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2013-01-31 15:35:20 +0100 |
|---|---|---|
| committer | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2013-01-31 15:35:20 +0100 |
| commit | ad044eb88861ebf2cefedc993634a85bb4697cd2 (patch) | |
| tree | cda074d68a48f18fc676df7d1b09f2c9f0536431 /apps/files/appinfo | |
| parent | cbafea4cc805093f34a6b46d3f1263860e1b5f3f (diff) | |
| parent | 8dd9dedee822d04afd918fc1f80555eabc2bb5b8 (diff) | |
| download | nextcloud-server-ad044eb88861ebf2cefedc993634a85bb4697cd2.tar.gz nextcloud-server-ad044eb88861ebf2cefedc993634a85bb4697cd2.zip | |
Merge branch 'master' into navigation
Diffstat (limited to 'apps/files/appinfo')
| -rw-r--r-- | apps/files/appinfo/app.php | 2 | ||||
| -rw-r--r-- | apps/files/appinfo/filesync.php | 4 | ||||
| -rw-r--r-- | apps/files/appinfo/info.xml | 2 | ||||
| -rw-r--r-- | apps/files/appinfo/version | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/apps/files/appinfo/app.php b/apps/files/appinfo/app.php index dfab94b15ea..da17a7f2ccd 100644 --- a/apps/files/appinfo/app.php +++ b/apps/files/appinfo/app.php @@ -1,5 +1,5 @@ <?php -$l=OC_L10N::get('files'); +$l = OC_L10N::get('files'); OCP\App::registerAdmin('files', 'admin'); diff --git a/apps/files/appinfo/filesync.php b/apps/files/appinfo/filesync.php index cbed56a6de5..47884a4f15e 100644 --- a/apps/files/appinfo/filesync.php +++ b/apps/files/appinfo/filesync.php @@ -43,7 +43,7 @@ if ($type != 'oc_chunked') { die; } -if (!OC_Filesystem::is_file($file)) { +if (!\OC\Files\Filesystem::is_file($file)) { OC_Response::setStatus(OC_Response::STATUS_NOT_FOUND); die; } @@ -51,7 +51,7 @@ if (!OC_Filesystem::is_file($file)) { switch($_SERVER['REQUEST_METHOD']) { case 'PUT': $input = fopen("php://input", "r"); - $org_file = OC_Filesystem::fopen($file, 'rb'); + $org_file = \OC\Files\Filesystem::fopen($file, 'rb'); $info = array( 'name' => basename($file), ); diff --git a/apps/files/appinfo/info.xml b/apps/files/appinfo/info.xml index 0a1b196b06f..7c82c839dab 100644 --- a/apps/files/appinfo/info.xml +++ b/apps/files/appinfo/info.xml @@ -5,7 +5,7 @@ <description>File Management</description> <licence>AGPL</licence> <author>Robin Appelman</author> - <require>4.9</require> + <require>4.91</require> <shipped>true</shipped> <standalone/> <default_enable/> diff --git a/apps/files/appinfo/version b/apps/files/appinfo/version index 0664a8fd291..2bf1ca5f549 100644 --- a/apps/files/appinfo/version +++ b/apps/files/appinfo/version @@ -1 +1 @@ -1.1.6 +1.1.7 |