diff options
| author | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-09-24 15:44:13 +0200 |
|---|---|---|
| committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-09-24 15:44:13 +0200 |
| commit | c0648f28310d524d85c956e1e99bc84cea7d8d4c (patch) | |
| tree | 32536a1ad5e087c8b3035c436ef6d46224609c4b | |
| parent | e783212262e57c7cc5f9282dc79a59c1f0a360f3 (diff) | |
simplify is compatible check
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | appinfo/app.php | 2 | ||||
| -rw-r--r-- | appinfo/routes.php | 2 | ||||
| -rw-r--r-- | appinfo/setup.php | 8 |
4 files changed, 4 insertions, 10 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 75d30d4e0..c0ed5c7e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ owncloud-news (3.105) * **Bugfix**: Various wording fixes -* **Bugfix**: Do not use Import/Export caption for settings buttons to avoid UX bugs in translated versions +* **Bugfix**: Do not use Import/Export caption for settings buttons to avoid UI bugs in translated versions * **Bugfix**: Catch all exceptions for feed update to not stop on db errors * **Bugfix**: Register error handler only once * **Bugfix**: Fix German translation diff --git a/appinfo/app.php b/appinfo/app.php index 98c033124..b4e7202dd 100644 --- a/appinfo/app.php +++ b/appinfo/app.php @@ -18,7 +18,7 @@ use \OCA\News\Config\DependencyException; require_once __DIR__ . '/setup.php'; -if (is_setup()) { +if (is_compatible()) { // Turn all errors into exceptions to combat shitty library behavior set_error_handler(function ($code, $message) { if ($code === E_ERROR || $code === E_USER_ERROR) { diff --git a/appinfo/routes.php b/appinfo/routes.php index 35ede4265..807803bf7 100644 --- a/appinfo/routes.php +++ b/appinfo/routes.php @@ -18,7 +18,7 @@ use \OCA\News\AppInfo\Application; require_once __DIR__ . '/setup.php'; -if (is_setup()) { +if (is_compatible()) { $application = new Application(); $application->registerRoutes($this, ['routes' => [ // page diff --git a/appinfo/setup.php b/appinfo/setup.php index d56b66971..0fefdfe63 100644 --- a/appinfo/setup.php +++ b/appinfo/setup.php @@ -13,17 +13,11 @@ namespace OCA\News\AppInfo; -function is_setup() { +function is_compatible() { // prevent breakage on 5.4 if (version_compare(phpversion(), '5.4', '<')) { return false; } - // disable useless codechecker in case security updates are shipped but - // blocked because of a bug in the checker - if (\OCP\Config::getSystemValue('appcodechecker') !== false) { - \OCP\Config::setSystemValue('appcodechecker', false); - } - return true; } |