diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/composer/composer/autoload_classmap.php | 2 | ||||
| -rw-r--r-- | lib/composer/composer/autoload_static.php | 2 | ||||
| -rw-r--r-- | lib/l10n/es.js | 1 | ||||
| -rw-r--r-- | lib/l10n/es.json | 1 | ||||
| -rw-r--r-- | lib/private/Repair.php | 2 | ||||
| -rw-r--r-- | lib/private/Repair/NC12/RepairIdentityProofKeyFolders.php (renamed from lib/private/Repair/NC13/RepairIdentityProofKeyFolders.php) | 4 | ||||
| -rw-r--r-- | lib/private/Repair/RepairMimeTypes.php | 15 | ||||
| -rw-r--r-- | lib/private/Template/SCSSCacher.php | 3 |
8 files changed, 23 insertions, 7 deletions
diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php index 4cef6a65388..e5fd3a88b0c 100644 --- a/lib/composer/composer/autoload_classmap.php +++ b/lib/composer/composer/autoload_classmap.php @@ -757,8 +757,8 @@ return array( 'OC\\Repair\\NC11\\MoveAvatars' => $baseDir . '/lib/private/Repair/NC11/MoveAvatars.php', 'OC\\Repair\\NC11\\MoveAvatarsBackgroundJob' => $baseDir . '/lib/private/Repair/NC11/MoveAvatarsBackgroundJob.php', 'OC\\Repair\\NC12\\InstallCoreBundle' => $baseDir . '/lib/private/Repair/NC12/InstallCoreBundle.php', + 'OC\\Repair\\NC12\\RepairIdentityProofKeyFolders' => $baseDir . '/lib/private/Repair/NC12/RepairIdentityProofKeyFolders.php', 'OC\\Repair\\NC12\\UpdateLanguageCodes' => $baseDir . '/lib/private/Repair/NC12/UpdateLanguageCodes.php', - 'OC\\Repair\\NC13\\RepairIdentityProofKeyFolders' => $baseDir . '/lib/private/Repair/NC13/RepairIdentityProofKeyFolders.php', 'OC\\Repair\\NC13\\RepairInvalidPaths' => $baseDir . '/lib/private/Repair/NC13/RepairInvalidPaths.php', 'OC\\Repair\\OldGroupMembershipShares' => $baseDir . '/lib/private/Repair/OldGroupMembershipShares.php', 'OC\\Repair\\Owncloud\\DropAccountTermsTable' => $baseDir . '/lib/private/Repair/Owncloud/DropAccountTermsTable.php', diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php index 50ab55365b4..652d6de99be 100644 --- a/lib/composer/composer/autoload_static.php +++ b/lib/composer/composer/autoload_static.php @@ -787,8 +787,8 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c 'OC\\Repair\\NC11\\MoveAvatars' => __DIR__ . '/../../..' . '/lib/private/Repair/NC11/MoveAvatars.php', 'OC\\Repair\\NC11\\MoveAvatarsBackgroundJob' => __DIR__ . '/../../..' . '/lib/private/Repair/NC11/MoveAvatarsBackgroundJob.php', 'OC\\Repair\\NC12\\InstallCoreBundle' => __DIR__ . '/../../..' . '/lib/private/Repair/NC12/InstallCoreBundle.php', + 'OC\\Repair\\NC12\\RepairIdentityProofKeyFolders' => __DIR__ . '/../../..' . '/lib/private/Repair/NC12/RepairIdentityProofKeyFolders.php', 'OC\\Repair\\NC12\\UpdateLanguageCodes' => __DIR__ . '/../../..' . '/lib/private/Repair/NC12/UpdateLanguageCodes.php', - 'OC\\Repair\\NC13\\RepairIdentityProofKeyFolders' => __DIR__ . '/../../..' . '/lib/private/Repair/NC13/RepairIdentityProofKeyFolders.php', 'OC\\Repair\\NC13\\RepairInvalidPaths' => __DIR__ . '/../../..' . '/lib/private/Repair/NC13/RepairInvalidPaths.php', 'OC\\Repair\\OldGroupMembershipShares' => __DIR__ . '/../../..' . '/lib/private/Repair/OldGroupMembershipShares.php', 'OC\\Repair\\Owncloud\\DropAccountTermsTable' => __DIR__ . '/../../..' . '/lib/private/Repair/Owncloud/DropAccountTermsTable.php', diff --git a/lib/l10n/es.js b/lib/l10n/es.js index 69723f2fe41..1f8cd934c14 100644 --- a/lib/l10n/es.js +++ b/lib/l10n/es.js @@ -176,6 +176,7 @@ OC.L10N.register( "Username must not consist of dots only" : "El nombre de usuario no debe consistir solo de puntos", "A valid password must be provided" : "Se debe proporcionar una contraseña válida", "The username is already being used" : "El nombre de usuario ya está en uso", + "Could not create user" : "No se ha podido crear el usuario", "User disabled" : "Usuario deshabilitado", "Login canceled by app" : "Login cancelado por la app", "No app name specified" : "No se ha especificado nombre de la aplicación", diff --git a/lib/l10n/es.json b/lib/l10n/es.json index 47c2097c1ae..3179b58e892 100644 --- a/lib/l10n/es.json +++ b/lib/l10n/es.json @@ -174,6 +174,7 @@ "Username must not consist of dots only" : "El nombre de usuario no debe consistir solo de puntos", "A valid password must be provided" : "Se debe proporcionar una contraseña válida", "The username is already being used" : "El nombre de usuario ya está en uso", + "Could not create user" : "No se ha podido crear el usuario", "User disabled" : "Usuario deshabilitado", "Login canceled by app" : "Login cancelado por la app", "No app name specified" : "No se ha especificado nombre de la aplicación", diff --git a/lib/private/Repair.php b/lib/private/Repair.php index 4e9a7cb5cec..80cd3c7fd45 100644 --- a/lib/private/Repair.php +++ b/lib/private/Repair.php @@ -40,7 +40,7 @@ use OC\Repair\NC11\FixMountStorages; use OC\Repair\NC11\MoveAvatars; use OC\Repair\NC12\InstallCoreBundle; use OC\Repair\NC12\UpdateLanguageCodes; -use OC\Repair\NC13\RepairIdentityProofKeyFolders; +use OC\Repair\NC12\RepairIdentityProofKeyFolders; use OC\Repair\OldGroupMembershipShares; use OC\Repair\Owncloud\DropAccountTermsTable; use OC\Repair\Owncloud\SaveAccountsTableData; diff --git a/lib/private/Repair/NC13/RepairIdentityProofKeyFolders.php b/lib/private/Repair/NC12/RepairIdentityProofKeyFolders.php index 93a135b5cf0..e02104ddf70 100644 --- a/lib/private/Repair/NC13/RepairIdentityProofKeyFolders.php +++ b/lib/private/Repair/NC12/RepairIdentityProofKeyFolders.php @@ -20,7 +20,7 @@ */ -namespace OC\Repair\NC13; +namespace OC\Repair\NC12; use OC\Files\AppData\Factory; @@ -83,7 +83,7 @@ class RepairIdentityProofKeyFolders implements IRepairStep { */ public function run(IOutput $output) { $versionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0'); - if (version_compare($versionFromBeforeUpdate, '13.0.0.1', '<=')) { + if (version_compare($versionFromBeforeUpdate, '12.0.1.5', '<=')) { $count = $this->repair(); $output->info('Repaired ' . $count . ' folders'); } diff --git a/lib/private/Repair/RepairMimeTypes.php b/lib/private/Repair/RepairMimeTypes.php index 0bf35c1d2ae..74d81be9834 100644 --- a/lib/private/Repair/RepairMimeTypes.php +++ b/lib/private/Repair/RepairMimeTypes.php @@ -100,7 +100,7 @@ class RepairMimeTypes implements IRepairStep { // insert mimetype \OC_DB::executeAudited(self::insertStmt(), array($mimetype)); } - + // get target mimetype id $result = \OC_DB::executeAudited(self::getIdStmt(), array($mimetype)); $mimetypeId = $result->fetchOne(); @@ -140,6 +140,15 @@ class RepairMimeTypes implements IRepairStep { $this->updateMimetypes($updatedMimetypes); } + private function introduceInternetShortcutTypes() { + $updatedMimetypes = [ + 'url' => 'application/internet-shortcut', + 'webloc' => 'application/internet-shortcut' + ]; + + $this->updateMimetypes($updatedMimetypes); + } + /** * Fix mime types */ @@ -161,5 +170,9 @@ class RepairMimeTypes implements IRepairStep { if (version_compare($ocVersionFromBeforeUpdate, '13.0.0.0', '<') && $this->introduceLocationTypes()) { $out->info('Fixed geospatial mime types'); } + + if (version_compare($ocVersionFromBeforeUpdate, '13.0.0.3', '<') && $this->introduceInternetShortcutTypes()) { + $out->info('Fixed internet-shortcut mime types'); + } } } diff --git a/lib/private/Template/SCSSCacher.php b/lib/private/Template/SCSSCacher.php index fe5a095c773..8ecbb9588a3 100644 --- a/lib/private/Template/SCSSCacher.php +++ b/lib/private/Template/SCSSCacher.php @@ -303,6 +303,7 @@ class SCSSCacher { * @return string */ private function prependBaseurlPrefix($cssFile) { - return md5($this->urlGenerator->getBaseUrl()) . '-' . $cssFile; + $frontendController = ($this->config->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true'); + return md5($this->urlGenerator->getBaseUrl() . $frontendController) . '-' . $cssFile; } } |