Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
owncloud: sync latest Fedora changes
- Loading branch information
1 parent
ed79679
commit 879e596
Showing
6 changed files
with
159 additions
and
26 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| From 463e2ea15d6fb71b96363d60c7e4bdc2c020eddf Mon Sep 17 00:00:00 2001 | ||
| From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu> | ||
| Date: Mon, 4 Jul 2016 13:47:03 +0200 | ||
| Subject: [PATCH] Initialize array elements properly | ||
|
|
||
| --- | ||
| lib/private/App/InfoParser.php | 2 +- | ||
| 1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
|
||
| diff --git a/lib/private/App/InfoParser.php b/lib/private/App/InfoParser.php | ||
| index c158e5c..843ed02 100644 | ||
| --- a/lib/private/App/InfoParser.php | ||
| +++ b/lib/private/App/InfoParser.php | ||
| @@ -141,7 +141,7 @@ function xmlToArray($xml) { | ||
| $totalElement = count($xml->{$element}); | ||
|
|
||
| if (!isset($array[$element])) { | ||
| - $array[$element] = ""; | ||
| + $array[$element] = $totalElement > 1 ? [] : ""; | ||
| } | ||
| /** @var \SimpleXMLElement $node */ | ||
| // Has attributes |
89 changes: 89 additions & 0 deletions
89
owncloud/owncloud-9.1.2-dont_warn_about_php_versions.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| diff --git a/console.php b/console.php | ||
| index 7235965..1f4b721 100644 | ||
| --- a/console.php | ||
| +++ b/console.php | ||
| @@ -33,21 +33,6 @@ use Symfony\Component\Console\Output\ConsoleOutput; | ||
|
|
||
| define('OC_CONSOLE', 1); | ||
|
|
||
| -// Show warning if a PHP version below 5.4.0 is used, this has to happen here | ||
| -// because base.php will already use 5.4 syntax. | ||
| -if (version_compare(PHP_VERSION, '5.4.0') === -1) { | ||
| - echo 'This version of ownCloud requires at least PHP 5.4.0'.PHP_EOL; | ||
| - echo 'You are currently running ' . PHP_VERSION . '. Please update your PHP version.'.PHP_EOL; | ||
| - return; | ||
| -} | ||
| - | ||
| -// Show warning if PHP 7.1 is used as ownCloud is not compatible with PHP 7.1 until | ||
| -// version 9.2.0. | ||
| -if (version_compare(PHP_VERSION, '7.1.0') !== -1) { | ||
| - echo 'This version of ownCloud is not compatible with PHP 7.1.<br/>'; | ||
| - echo 'You are currently running ' . PHP_VERSION . '. Please use at least ownCloud 9.2.0.'; | ||
| - return; | ||
| -} | ||
|
|
||
| function exceptionHandler($exception) { | ||
| echo "An unhandled exception has been thrown:" . PHP_EOL; | ||
| @@ -78,7 +63,7 @@ try { | ||
| echo "Console has to be executed with the user that owns the file config/config.php" . PHP_EOL; | ||
| echo "Current user: " . $user['name'] . PHP_EOL; | ||
| echo "Owner of config.php: " . $configUser['name'] . PHP_EOL; | ||
| - echo "Try adding 'sudo -u " . $configUser['name'] . " ' to the beginning of the command (without the single quotes)" . PHP_EOL; | ||
| + echo "Try adding 'sudo -u " . $configUser['name'] . " ' to the beginning of the command (without the single quotes)" . PHP_EOL; | ||
| exit(0); | ||
| } | ||
| } | ||
| diff --git a/index.php b/index.php | ||
| index 136ddcb..5230cb2 100644 | ||
| --- a/index.php | ||
| +++ b/index.php | ||
| @@ -24,31 +24,9 @@ | ||
| * | ||
| */ | ||
|
|
||
| -// Show warning if a PHP version below 5.4.0 is used, this has to happen here | ||
| -// because base.php will already use 5.4 syntax. | ||
| -if (version_compare(PHP_VERSION, '5.4.0') === -1) { | ||
| - echo 'This version of ownCloud requires at least PHP 5.4.0<br/>'; | ||
| - echo 'You are currently running ' . PHP_VERSION . '. Please update your PHP version.'; | ||
| - return; | ||
| -} | ||
| - | ||
| -// Show warning if PHP 7.1 is used as ownCloud is not compatible with PHP 7.1 until | ||
| -// version 9.2.0. | ||
| -if (version_compare(PHP_VERSION, '7.1.0') !== -1) { | ||
| - echo 'This version of ownCloud is not compatible with PHP 7.1.<br/>'; | ||
| - echo 'You are currently running ' . PHP_VERSION . '. Please use at least ownCloud 9.2.0.'; | ||
| - return; | ||
| -} | ||
| - | ||
| -// running oC on Windows is unsupported since 8.1, this has to happen here because | ||
| -// is seems that the autoloader on Windows fails later and just throws an exception. | ||
| -if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') { | ||
| - echo 'ownCloud Server does not support Microsoft Windows.'; | ||
| - return; | ||
| -} | ||
|
|
||
| try { | ||
| - | ||
| + | ||
| require_once 'lib/base.php'; | ||
|
|
||
| OC::handleRequest(); | ||
| diff --git a/settings/Controller/CheckSetupController.php b/settings/Controller/CheckSetupController.php | ||
| index 52ef34d..e39fdf2 100644 | ||
| --- a/settings/Controller/CheckSetupController.php | ||
| +++ b/settings/Controller/CheckSetupController.php | ||
| @@ -349,11 +349,7 @@ Raw output | ||
| protected function isEndOfLive() { | ||
| $eol = false; | ||
|
|
||
| - //PHP 5.4 is EOL on 14 Sep 2015 | ||
| - if (version_compare(PHP_VERSION, '5.5.0') === -1) { | ||
| - $eol = true; | ||
| - return $eol; | ||
| - } | ||
| + // Red Hat support PHP so don't EOL | ||
| return $eol; | ||
| } | ||
| } |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| diff --git a/settings/Controller/SecuritySettingsController.php b/settings/Controller/SecuritySettingsController.php | ||
| index 88b2803..5c6f174 100644 | ||
| --- a/settings/Controller/SecuritySettingsController.php | ||
| +++ b/settings/Controller/SecuritySettingsController.php | ||
| @@ -60,7 +60,7 @@ protected function returnSuccess() { | ||
| * @return array | ||
| */ | ||
| public function trustedDomains($newTrustedDomain) { | ||
| - $trustedDomains = $this->config->getSystemValue('trusted_domains'); | ||
| + $trustedDomains = $this->config->getSystemValue('trusted_domains', []); | ||
| $trustedDomains[] = $newTrustedDomain; | ||
| $this->config->setSystemValue('trusted_domains', $trustedDomains); | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters