Commit 36dd2735 authored by Philipp Schaffrath's avatar Philipp Schaffrath Committed by Thomas Müller
Browse files

Fixes incorrect loading of file when using the console from a sibling OC...

Fixes incorrect loading of file when using the console from a sibling OC instance directory (#26301)
parent 14931fa2
......@@ -9,7 +9,7 @@
* consider important for your instance to your working ``config.php``, and
* apply configuration options that are pertinent for your instance.
*
* This file is used to generate the configuration documentation.
* This file is used to generate the configuration documentation.
* Please consider following requirements of the current parser:
* * all comments need to start with `/**` and end with ` *\/` - each on their
* own line
......@@ -426,20 +426,20 @@ $CONFIG = array(
*
* Available values:
*
* * ``auto``
* default setting. keeps files and folders in the trash bin for 30 days
* and automatically deletes anytime after that if space is needed (note:
* * ``auto``
* default setting. keeps files and folders in the trash bin for 30 days
* and automatically deletes anytime after that if space is needed (note:
* files may not be deleted if space is not needed).
* * ``D, auto``
* keeps files and folders in the trash bin for D+ days, delete anytime if
* * ``D, auto``
* keeps files and folders in the trash bin for D+ days, delete anytime if
* space needed (note: files may not be deleted if space is not needed)
* * ``auto, D``
* delete all files in the trash bin that are older than D days
* * ``auto, D``
* delete all files in the trash bin that are older than D days
* automatically, delete other files anytime if space needed
* * ``D1, D2``
* keep files and folders in the trash bin for at least D1 days and
* * ``D1, D2``
* keep files and folders in the trash bin for at least D1 days and
* delete when exceeds D2 days
* * ``disabled``
* * ``disabled``
* trash bin auto clean disabled, files and folders will be kept forever
*/
'trashbin_retention_obligation' => 'auto',
......@@ -462,23 +462,23 @@ $CONFIG = array(
* Both minimum and maximum times can be set together to explicitly define
* version deletion. For migration purposes, this setting is installed
* initially set to "auto", which is equivalent to the default setting in
* ownCloud 8.1 and before.
* ownCloud 8.1 and before.
*
* Available values:
*
* * ``auto``
* default setting. Automatically expire versions according to expire
* rules. Please refer to :doc:`../configuration_files/file_versioning` for
* * ``auto``
* default setting. Automatically expire versions according to expire
* rules. Please refer to :doc:`../configuration_files/file_versioning` for
* more information.
* * ``D, auto``
* keep versions at least for D days, apply expire rules to all versions
* * ``D, auto``
* keep versions at least for D days, apply expire rules to all versions
* that are older than D days
* * ``auto, D``
* delete all versions that are older than D days automatically, delete
* * ``auto, D``
* delete all versions that are older than D days automatically, delete
* other versions according to expire rules
* * ``D1, D2``
* * ``D1, D2``
* keep versions for at least D1 days and delete when exceeds D2 days
* * ``disabled``
* * ``disabled``
* versions auto clean disabled, versions will be kept forever
*/
'versions_retention_obligation' => 'auto',
......@@ -681,13 +681,14 @@ $CONFIG = array(
* to that folder, starting from the ownCloud webroot. The key ``writable``
* indicates if a Web server can write files to that folder.
*/
'apps_paths' => array(
array(
'path'=> '/var/www/owncloud/apps',
'url' => '/apps',
'writable' => true,
),
),
'apps_paths' =>
array (
array (
'path' => OC::$SERVERROOT.'/apps',
'url' => '/apps',
'writable' => true,
)
),
/**
* @see appcodechecker
......@@ -852,9 +853,9 @@ $CONFIG = array(
/**
* Enable maintenance mode to disable ownCloud
*
* If you want to prevent users from logging in to ownCloud before you start
* doing some maintenance work, you need to set the value of the maintenance
* parameter to true. Please keep in mind that users who are already logged-in
* If you want to prevent users from logging in to ownCloud before you start
* doing some maintenance work, you need to set the value of the maintenance
* parameter to true. Please keep in mind that users who are already logged-in
* are kicked out of ownCloud instantly.
*/
'maintenance' => false,
......@@ -1108,7 +1109,7 @@ $CONFIG = array(
/**
* Exclude specific directory names and disallow scanning, creating and renaming
* using these names. Case insensitive.
* Excluded directory names are queried at any path part like at the beginning,
* Excluded directory names are queried at any path part like at the beginning,
* in the middle or at the end and will not be further processed if found.
* Please see the documentation for details and examples.
* Use when the storage backend supports eg snapshot directories to be excluded.
......@@ -1155,8 +1156,8 @@ $CONFIG = array(
'quota_include_external_storage' => false,
/**
* Specifies how often the local filesystem (the ownCloud data/ directory, and
* NFS mounts in data/) is checked for changes made outside ownCloud. This
* Specifies how often the local filesystem (the ownCloud data/ directory, and
* NFS mounts in data/) is checked for changes made outside ownCloud. This
* does not apply to external storages.
*
* 0 -> Never check the filesystem for outside changes, provides a performance
......@@ -1212,7 +1213,7 @@ $CONFIG = array(
/**
* List of trusted proxy servers
*
*
* If you configure these also consider setting `forwarded_for_headers` which
* otherwise defaults to `HTTP_X_FORWARDED_FOR` (the `X-Forwarded-For` header).
*/
......
......@@ -47,7 +47,7 @@ function exceptionHandler($exception) {
exit(1);
}
try {
require_once 'lib/base.php';
require_once __DIR__ . '/lib/base.php';
// set to run indefinitely if needed
set_time_limit(0);
......
......@@ -31,7 +31,7 @@
try {
require_once 'lib/base.php';
require_once __DIR__ . '/lib/base.php';
if (\OCP\Util::needUpgrade()) {
\OCP\Util::writeLog('cron', 'Update required, skipping cron', \OCP\Util::DEBUG);
......
......@@ -33,8 +33,8 @@ if (version_compare(PHP_VERSION, '5.6.0') === -1) {
}
try {
require_once 'lib/base.php';
require_once __DIR__ . '/lib/base.php';
OC::handleRequest();
......
......@@ -22,7 +22,7 @@
*
*/
require_once '../lib/base.php';
require_once __DIR__ . '/../lib/base.php';
header('Content-type: application/xml');
......
......@@ -27,7 +27,7 @@
*
*/
require_once '../lib/base.php';
require_once __DIR__ . '/../lib/base.php';
if (\OCP\Util::needUpgrade()
|| \OC::$server->getSystemConfig()->getValue('maintenance', false)
......
......@@ -19,4 +19,4 @@
*
*/
require_once 'v1.php';
require_once __DIR__ . '/v1.php';
......@@ -27,7 +27,7 @@
*/
try {
require_once 'lib/base.php';
require_once __DIR__ . '/lib/base.php';
if (\OCP\Util::needUpgrade()) {
// since the behavior of apps or remotes are unpredictable during
// an upgrade, return a 503 directly
......
......@@ -106,7 +106,7 @@ function resolveService($service) {
}
try {
require_once 'lib/base.php';
require_once __DIR__ . '/lib/base.php';
// All resources served via the DAV endpoint should have the strictest possible
// policy. Exempted from this is the SabreDAV browser plugin which overwrites
......
......@@ -28,7 +28,7 @@
try {
require_once 'lib/base.php';
require_once __DIR__ . '/lib/base.php';
$systemConfig = \OC::$server->getSystemConfig();
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment