diff options
| -rw-r--r-- | .htaccess | 2 | ||||
| -rw-r--r-- | apps/files_external/lib/config.php | 12 | ||||
| -rw-r--r-- | lib/private/app.php | 2 | ||||
| -rw-r--r-- | status.php | 2 | ||||
| -rw-r--r-- | version.php | 4 |
5 files changed, 18 insertions, 4 deletions
diff --git a/.htaccess b/.htaccess index bcda6046626..b3b22eef19f 100644 --- a/.htaccess +++ b/.htaccess @@ -1,4 +1,4 @@ -# Version: 8.0.6 +# Version: 8.0.7 <IfModule mod_fcgid.c> <IfModule mod_setenvif.c> <IfModule mod_headers.c> diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php index ddfab439879..8eb968e2d4b 100644 --- a/apps/files_external/lib/config.php +++ b/apps/files_external/lib/config.php @@ -490,6 +490,11 @@ class OC_Mount_Config { return false; } + if (isset($classOptions['objectstore'])) { + // objectstore cannot be set by client side + return false; + } + if (!isset($backends[$class])) { // invalid backend return false; @@ -843,6 +848,13 @@ class OC_Mount_Config { $mountPoint[$applicable][$mountPath]['priority'] = $data[$mountType][$applicable][$mountPath]['priority']; } + // Persistent objectstore + if (isset($data[$mountType][$applicable][$mountPath]) + && isset($data[$mountType][$applicable][$mountPath]['objectstore']) + ) { + $mountPoint[$applicable][$mountPath]['objectstore'] + = $data[$mountType][$applicable][$mountPath]['objectstore']; + } $data[$mountType][$applicable] = array_merge($data[$mountType][$applicable], $mountPoint[$applicable]); } else { diff --git a/lib/private/app.php b/lib/private/app.php index 6f0abf58e17..11040840179 100644 --- a/lib/private/app.php +++ b/lib/private/app.php @@ -1129,7 +1129,7 @@ class OC_App { // check for required dependencies $dependencyAnalyzer = new DependencyAnalyzer(new Platform($config), $l); - $missing = $dependencyAnalyzer->analyze($app); + $missing = $dependencyAnalyzer->analyze($info); if(!empty($missing)) { $missingMsg = join(PHP_EOL, $missing); throw new \Exception( diff --git a/status.php b/status.php index f7bdfe1fd51..9d26772745e 100644 --- a/status.php +++ b/status.php @@ -38,6 +38,8 @@ try { if (OC::$CLI) { print_r($values); } else { + header('Access-Control-Allow-Origin: *'); + header('Content-Type: application/json'); echo json_encode($values); } diff --git a/version.php b/version.php index 16cb26bc744..3099d178c8a 100644 --- a/version.php +++ b/version.php @@ -3,10 +3,10 @@ // We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel // when updating major/minor version number. -$OC_Version=array(8, 0, 6, 2); +$OC_Version=array(8, 0, 7, 1); // The human readable string -$OC_VersionString='8.0.6'; +$OC_VersionString='8.0.7 RC1'; // The ownCloud channel $OC_Channel='git'; |