Skip to content

Commit bbb168a

Browse files
authored
Merge pull request #14430 from nextcloud/bugfix/13990/remove-upload-setting
Remove the upload and memory setting
2 parents daee222 + c6a69ba commit bbb168a

File tree

19 files changed

+7
-649
lines changed

19 files changed

+7
-649
lines changed

.htaccess

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,6 @@
3131
</FilesMatch>
3232
</IfModule>
3333
<IfModule mod_php7.c>
34-
php_value upload_max_filesize 511M
35-
php_value post_max_size 511M
36-
php_value memory_limit 512M
3734
php_value mbstring.func_overload 0
3835
php_value default_charset 'UTF-8'
3936
php_value output_buffering 0

.user.ini

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
upload_max_filesize=511M
2-
post_max_size=511M
3-
memory_limit=512M
41
mbstring.func_overload=0
52
always_populate_raw_post_data=-1
63
default_charset='UTF-8'

apps/files/appinfo/info.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,6 @@
3535
<command>OCA\Files\Command\ScanAppData</command>
3636
</commands>
3737

38-
<settings>
39-
<admin>OCA\Files\Settings\Admin</admin>
40-
</settings>
41-
4238
<activity>
4339
<settings>
4440
<setting>OCA\Files\Activity\Settings\FavoriteAction</setting>

apps/files/appinfo/routes.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,6 @@
7676
'url' => '/',
7777
'verb' => 'GET',
7878
],
79-
[
80-
'name' => 'settings#setMaxUploadSize',
81-
'url' => '/settings/maxUpload',
82-
'verb' => 'POST',
83-
],
8479
[
8580
'name' => 'ajax#getStorageStats',
8681
'url' => '/ajax/getstoragestats.php',

apps/files/composer/composer/autoload_classmap.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,7 @@
3131
'OCA\\Files\\Command\\TransferOwnership' => $baseDir . '/../lib/Command/TransferOwnership.php',
3232
'OCA\\Files\\Controller\\AjaxController' => $baseDir . '/../lib/Controller/AjaxController.php',
3333
'OCA\\Files\\Controller\\ApiController' => $baseDir . '/../lib/Controller/ApiController.php',
34-
'OCA\\Files\\Controller\\SettingsController' => $baseDir . '/../lib/Controller/SettingsController.php',
3534
'OCA\\Files\\Controller\\ViewController' => $baseDir . '/../lib/Controller/ViewController.php',
3635
'OCA\\Files\\Helper' => $baseDir . '/../lib/Helper.php',
3736
'OCA\\Files\\Service\\TagService' => $baseDir . '/../lib/Service/TagService.php',
38-
'OCA\\Files\\Settings\\Admin' => $baseDir . '/../lib/Settings/Admin.php',
3937
);

apps/files/composer/composer/autoload_static.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,9 @@ class ComposerStaticInitFiles
4646
'OCA\\Files\\Command\\TransferOwnership' => __DIR__ . '/..' . '/../lib/Command/TransferOwnership.php',
4747
'OCA\\Files\\Controller\\AjaxController' => __DIR__ . '/..' . '/../lib/Controller/AjaxController.php',
4848
'OCA\\Files\\Controller\\ApiController' => __DIR__ . '/..' . '/../lib/Controller/ApiController.php',
49-
'OCA\\Files\\Controller\\SettingsController' => __DIR__ . '/..' . '/../lib/Controller/SettingsController.php',
5049
'OCA\\Files\\Controller\\ViewController' => __DIR__ . '/..' . '/../lib/Controller/ViewController.php',
5150
'OCA\\Files\\Helper' => __DIR__ . '/..' . '/../lib/Helper.php',
5251
'OCA\\Files\\Service\\TagService' => __DIR__ . '/..' . '/../lib/Service/TagService.php',
53-
'OCA\\Files\\Settings\\Admin' => __DIR__ . '/..' . '/../lib/Settings/Admin.php',
5452
);
5553

5654
public static function getInitializer(ClassLoader $loader)

apps/files/js/admin.js

Lines changed: 0 additions & 70 deletions
This file was deleted.

apps/files/lib/Controller/SettingsController.php

Lines changed: 0 additions & 51 deletions
This file was deleted.

apps/files/lib/Settings/Admin.php

Lines changed: 0 additions & 87 deletions
This file was deleted.

apps/files/templates/admin.php

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)