mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #8861 from nextcloud/rakekniven-patch-1 

Update ThemingController.php
This commit is contained in:
Joas Schilling 2018-03-20 13:45:20 +01:00 committed by GitHub
parent 99abe3bc8e 789221a0fc
commit 64feb3f391
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/theming/lib/Controller/ThemingController.php
View File

@ -218,14 +218,14 @@ class ThemingController extends Controller {
$newBackgroundLogo = $this->request->getUploadedFile('upload-login-background');
$error = null;
$phpFileUploadErrors = [
UPLOAD_ERR_OK => $this->l10n->t('There is no error, the file uploaded with success'),
UPLOAD_ERR_OK => $this->l10n->t('The file was uploaded'),
UPLOAD_ERR_INI_SIZE => $this->l10n->t('The uploaded file exceeds the upload_max_filesize directive in php.ini'),
UPLOAD_ERR_FORM_SIZE => $this->l10n->t('The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form'),
UPLOAD_ERR_PARTIAL => $this->l10n->t('The file was only partially uploaded'),
UPLOAD_ERR_NO_FILE => $this->l10n->t('No file was uploaded'),
UPLOAD_ERR_NO_TMP_DIR => $this->l10n->t('Missing a temporary folder'),
UPLOAD_ERR_CANT_WRITE => $this->l10n->t('Failed to write file to disk.'),
UPLOAD_ERR_EXTENSION => $this->l10n->t('A PHP extension stopped the file upload.'),
UPLOAD_ERR_CANT_WRITE => $this->l10n->t('Could not write file to disk'),
UPLOAD_ERR_EXTENSION => $this->l10n->t('A PHP extension stopped the file upload'),
];
if (empty($newLogo) && empty($newBackgroundLogo)) {
$error = $this->l10n->t('No file uploaded');

4
apps/theming/tests/Controller/ThemingControllerTest.php
View File

@ -529,8 +529,8 @@ class ThemingControllerTest extends TestCase {
[UPLOAD_ERR_PARTIAL, 'The file was only partially uploaded'],
[UPLOAD_ERR_NO_FILE, 'No file was uploaded'],
[UPLOAD_ERR_NO_TMP_DIR, 'Missing a temporary folder'],
[UPLOAD_ERR_CANT_WRITE, 'Failed to write file to disk.'],
[UPLOAD_ERR_EXTENSION, 'A PHP extension stopped the file upload.'],
[UPLOAD_ERR_CANT_WRITE, 'Could not write file to disk'],
[UPLOAD_ERR_EXTENSION, 'A PHP extension stopped the file upload'],
];
}